diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
index bd5799645..c57fb7f5d 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun
+++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun
@@ -119,13 +119,14 @@ case "$1" in
 			ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
 			systemctl restart systemd-networkd
 			;;
-		rockchip|rk3399|rockchip64|s5p6818|odroidc1)
-			set_fixed_mac
-			;;
 		*)
 
 	esac
 
+	# varios temporary hardware workarounds
+	[[ $BRANCH == dev && ( $LINUXFAMILY == rk3399 || $LINUXFAMILY == rockchip64 )]] && set_fixed_mac
+	[[ $BRANCH == dev && $LINUXFAMILY == rockchip ]] && set_fixed_mac
+
 	systemctl disable armbian-firstrun
 	exit 0
 	;;