diff --git a/rootfs/standard/usr/bin/mynode_post_upgrade.sh b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
index 43278ca7..e4e305fe 100755
--- a/rootfs/standard/usr/bin/mynode_post_upgrade.sh
+++ b/rootfs/standard/usr/bin/mynode_post_upgrade.sh
@@ -304,9 +304,10 @@ systemctl enable netdata
 systemctl enable webssh2
 
 # Disable any old services
-sudo systemctl disable hitch
-sudo systemctl disable mongodb
-sudo systemctl disable lnd_admin
+systemctl disable hitch
+systemctl disable mongodb
+systemctl disable lnd_admin
+systemctl disable dhcpcd || true
 
 # Reload service settings
 systemctl daemon-reload
diff --git a/setup/setup_device.sh b/setup/setup_device.sh
index e15b3027..9077c745 100755
--- a/setup/setup_device.sh
+++ b/setup/setup_device.sh
@@ -432,8 +432,8 @@ systemctl enable netdata
 systemctl enable webssh2
 
 
-# Regenerate MAC Address for Rock64
-if [ $IS_ROCK64 = 1 ]; then
+# Regenerate MAC Address for Armbian devices
+if [ $IS_ROCK64 = 1 ] || [ $IS_ROCKPRO64 = 1] ; then
     . /usr/lib/armbian/armbian-common
     CONNECTION="$(nmcli -f UUID,ACTIVE,DEVICE,TYPE connection show --active | tail -n1)"
     UUID=$(awk -F" " '/ethernet/ {print $1}' <<< "${CONNECTION}")
@@ -443,6 +443,9 @@ if [ $IS_ROCK64 = 1 ]; then
 fi
 
 
+# Disable services
+sudo systemctl disable hitch
+
 
 # Delete junk
 rm -rf /home/admin/download