diff --git a/packages/bsp/common/usr/lib/armbian/armbian-common b/packages/bsp/common/usr/lib/armbian/armbian-common
index 57f03d1a6..18af42bea 100644
--- a/packages/bsp/common/usr/lib/armbian/armbian-common
+++ b/packages/bsp/common/usr/lib/armbian/armbian-common
@@ -36,6 +36,7 @@ get_random_mac
 uuid=$(nmcli -f UUID,DEVICE,TYPE connection show --active | grep ethernet | awk '{print $1}' | head -1)
 if [[ -n $uuid ]]; then
 	nmcli connection modify $uuid ethernet.cloned-mac-address $MACADDR
+	nmcli connection modify $uuid -ethernet.mac-address ""
 	nmcli connection down $uuid >/dev/null 2>&1
 	nmcli connection up $uuid >/dev/null 2>&1
 	return 0
diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
old mode 100755
new mode 100644
index e26825ad6..ca318ad18
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
@@ -100,7 +100,7 @@ case "$1" in
 			ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
 			systemctl restart systemd-networkd
 			;;
-		rockchip|s5p6818|odroidc1)
+		rockchip|rk3399|rockchip64|s5p6818|odroidc1)
 			set_fixed_mac
 			;;
 		*)