diff --git a/config/targets-cli-beta.conf b/config/targets-cli-beta.conf
index 1d7525cc54..ecd9b78e25 100644
--- a/config/targets-cli-beta.conf
+++ b/config/targets-cli-beta.conf
@@ -63,7 +63,7 @@ rk322x-box                   edge            jammy       cli
 
 
 # Radxa rock-3a
-rock-3a                      legacy          jammy       cli                      beta         yes
+#rock-3a                      legacy          jammy       cli                      beta         yes
 
 
 # Raspberry Pi4
diff --git a/lib/distributions.sh b/lib/distributions.sh
index 41b89cefad..356f8ecd2b 100644
--- a/lib/distributions.sh
+++ b/lib/distributions.sh
@@ -289,12 +289,12 @@ install_common()
 			UPSTREM_VER=$(dpkg-deb -f "${SDCARD}"/var/cache/apt/archives/linux-u-boot-${BOARD}-${BRANCH}*_${ARCH}.deb Version)
 		fi
 	}
-	
+
 	call_extension_method "pre_install_kernel_debs"  << 'PRE_INSTALL_KERNEL_DEBS'
 *called before installing the Armbian-built kernel deb packages*
 It is not too late to `unset KERNELSOURCE` here and avoid kernel install.
 PRE_INSTALL_KERNEL_DEBS
-	
+
 	# install kernel
 	[[ -n $KERNELSOURCE ]] && {
 		if [[ "${REPOSITORY_INSTALL}" != *kernel* ]]; then
@@ -446,6 +446,9 @@ FAMILY_TWEAKS
 	chroot "${SDCARD}" /bin/bash -c "chown root:messagebus /usr/lib/dbus-1.0/dbus-daemon-launch-helper"
 	chroot "${SDCARD}" /bin/bash -c "chmod u+s /usr/lib/dbus-1.0/dbus-daemon-launch-helper"
 
+	# disable sambe since it hangs when no network is present at boot
+	chroot "${SDCARD}" /bin/bash -c "systemctl --quiet disable smbd 2> /dev/null"
+
 	# disable low-level kernel messages for non betas
 	if [[ -z $BETA ]]; then
 		sed -i "s/^#kernel.printk*/kernel.printk/" "${SDCARD}"/etc/sysctl.conf