diff --git a/.meta/dietpi-survey_report b/.meta/dietpi-survey_report
index 00c861393d..bcde90cd71 100755
--- a/.meta/dietpi-survey_report
+++ b/.meta/dietpi-survey_report
@@ -920,8 +920,10 @@ shopt -s extglob
 			[[ $i == 'Unknown Device (aarch64)' ]] && ((aDEVICE_NAME['Generic Device (aarch64)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]"
 			[[ $i == 'NanoPi M1/T1 (armv7l)' ]] && ((aDEVICE_NAME['NanoPi M1 (armv7l)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]" # v8.11
 			[[ $i == 'NanoPi R5S (aarch64)' ]] && ((aDEVICE_NAME['NanoPi R5S/R5C (aarch64)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]" # v8.13
-			[[ $i == 'NanoPi R6S (aarch64)' ]] && ((aDEVICE_NAME['NanoPi R6S/R6C (aarch64)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]" # v8.17
+			[[ $i == 'NanoPi R6S (aarch64)' ]] && ((aDEVICE_NAME['NanoPi 6 series (aarch64)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]" # v8.17
 			[[ $i == 'ROCK Pi 4 (aarch64)' ]] && ((aDEVICE_NAME['ROCK 4 (aarch64)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]" # v8.17
+			[[ $i == 'ROCK 5B (aarch64)' ]] && ((aDEVICE_NAME['ROCK 5 (aarch64)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]" # v8.19
+			[[ $i == 'NanoPi R6S/R6C (aarch64)' ]] && ((aDEVICE_NAME['NanoPi 6 series (aarch64)']+=aDEVICE_NAME[$i])) && unset -v "aDEVICE_NAME[$i]" # v8.19
 		done
 
 		# Process all results, for later use in HTML printout
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 556adc618f..666d8d0562 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,10 @@
 v8.19
 (2023-07-01)
 
+New images:
+- NanoPC T6 | Our NanoPi R6S/R6C image runs as well on the new NanoPC T6. After some polishing, we merged the hardware IDs to be identified and named as "NanoPi 6 series".
+- ROCK 5A | As our ROCK 5B image runs as well on the new ROCK 5A, we merged the hardware IDs to be identified and named as "ROCK 5", following the example of the ROCK 4.
+
 New software:
 - MediaWiki | The collaboration and documentation platform which was developed for and is used by Wikipedia has been added to our software catalogue.
 
diff --git a/dietpi/func/dietpi-obtain_hw_model b/dietpi/func/dietpi-obtain_hw_model
index 6acde2e5e5..c5abe504a9 100755
--- a/dietpi/func/dietpi-obtain_hw_model
+++ b/dietpi/func/dietpi-obtain_hw_model
@@ -319,12 +319,12 @@
 
 			elif (( $G_HW_MODEL == 79 )); then
 
-				G_HW_MODEL_NAME='NanoPi R6S/R6C'
+				G_HW_MODEL_NAME='NanoPi 6 series'
 				G_HW_CPUID=11
 
 			elif (( $G_HW_MODEL == 78 )); then
 
-				G_HW_MODEL_NAME='ROCK 5B'
+				G_HW_MODEL_NAME='ROCK 5'
 				G_HW_CPUID=11
 
 			elif (( $G_HW_MODEL == 77 )); then