diff --git a/config/templates/customize-image.sh.template b/config/templates/customize-image.sh.template
index 2a66ba1316..b656b26904 100644
--- a/config/templates/customize-image.sh.template
+++ b/config/templates/customize-image.sh.template
@@ -159,7 +159,7 @@ InstallOpenMediaVault() {
 	# based devices). Move all NAS daemons to the big cores.
 	# to 1MB: https://forum.odroid.com/viewtopic.php?f=146&t=26016&start=200#p197729
 	if [ "${BOARD}" = "odroidxu4" ]; then
-		XU4_HMP_Fix='; taskset -c -p 4-7 $i '
+		HMP_Fix='; taskset -c -p 4-7 $i '
 		# Cloudshell stuff (fan, lcd, missing serials on 1st CS2 batch)
 		echo "H4sIAKdXHVkCA7WQXWuDMBiFr+eveOe6FcbSrEIH3WihWx0rtVbUFQqCqAkYGhJn
 		tF1x/vep+7oebDfh5DmHwJOzUxwzgeNIpRp9zWRegDPznya4VDlWTXXbpS58XJtD
@@ -168,13 +168,15 @@ InstallOpenMediaVault() {
 		QL+Cr8rJJSmTouuuRzfDtluarm1aLVHksgWmvanm5sbfOmY3JEztWu5tV9bCXn4S
 		HB8RIzjoUbGvFvPw/tmr0UMr6bWSBupVrulY2xp9T1bruWnVga7DdAqYFgkuCd3j
 		vORUDQgej9HPJxmDDv+3WxblBSuYFH8oiNpHz8XvPIkU9B3JVCJ/awIAAA==" \
-		| tr -d '[:blank:]' | base64 --decode | gunzip -c >/usr/local/sbin/coudshell2-support.sh
+		| tr -d '[:blank:]' | base64 --decode | gunzip -c >/usr/local/sbin/cloudshell2-support.sh
 		chmod 755 /usr/local/sbin/coudshell2-support.sh
 		apt install -y i2c-tools odroid-cloudshell cloudshell2-fan
 		sed -i '/systemctl\ disable\ firstrun/i \
-		/usr/sbin/i2cdetect -y 1 | grep -q "60: 60" && /usr/local/sbin/coudshell2-support.sh' /etc/init.d/firstrun
+		/usr/sbin/i2cdetect -y 1 | grep -q "60: 60" && /usr/local/sbin/cloudshell2-support.sh' /etc/init.d/firstrun
+	elif [ "${BOARD}" = "nanopim3" ]; then
+		HMP_Fix='; taskset -c -p 4-7 $i '
 	fi
-	echo "* * * * * root for i in \`pgrep \"ftpd|nfsiod|smbd|afpd|cnid\"\` ; do ionice -c1 -p \$i ${XU4_HMP_Fix}; done >/dev/null 2>&1" \
+	echo "* * * * * root for i in \`pgrep \"ftpd|nfsiod|smbd|afpd|cnid\"\` ; do ionice -c1 -p \$i ${HMP_Fix}; done >/dev/null 2>&1" \
 		>/etc/cron.d/make_nas_processes_faster
 	chmod 600 /etc/cron.d/make_nas_processes_faster
 
diff --git a/packages/bsp/common/etc/init.d/armhwinfo b/packages/bsp/common/etc/init.d/armhwinfo
index e315dc6beb..1f8c757334 100755
--- a/packages/bsp/common/etc/init.d/armhwinfo
+++ b/packages/bsp/common/etc/init.d/armhwinfo
@@ -252,15 +252,15 @@ prepare_board() {
 					echo 32768 >/proc/sys/net/core/rps_sock_flow_entries
 					echo 32768 >/sys/class/net/eth0/queues/rx-0/rps_flow_cnt
 					;;
-				nanopim3) # dw-mci on cpu1, USB OTG on cpu2, GbE on cpu3, USB2 on cpu4, video-codec on cpu5
+				nanopim3) # dw-mci on cpu1, USB host on cpu2, GbE on cpu3, USB OTG on cpu4, video-codec on cpu5
 					for i in $(awk -F':' '/dw-mci/{print $1}' </proc/interrupts | sed 's/\ //g'); do
-						echo 2 >/proc/irq/$i/smp_affinity
+						echo 1 >/proc/irq/$i/smp_affinity_list
 					done
-					echo 4 >/proc/irq/$(awk -F":" "/usb1/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
-					echo 8 >/proc/irq/$(awk -F":" "/eth0/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
-					echo 16 >/proc/irq/$(awk -F":" "/usb3/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity
+					echo 2 >/proc/irq/$(awk -F":" "/usb3/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity_list
+					echo 3 >/proc/irq/$(awk -F":" "/eth0/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity_list
+					echo 4 >/proc/irq/$(awk -F":" "/usb1/ {print \$1}" </proc/interrupts | sed 's/\ //g')/smp_affinity_list
 					for i in $(awk -F':' '/c0080000.video-codec/{print $1}' </proc/interrupts | sed 's/\ //g'); do
-						echo 32 >/proc/irq/$i/smp_affinity
+						echo 5 >/proc/irq/$i/smp_affinity_list
 					done
 					echo 7 >/sys/class/net/eth0/queues/rx-0/rps_cpus
 					echo 32768 >/proc/sys/net/core/rps_sock_flow_entries