diff --git a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
index daaefd9c0738..9d5146d3fd40 100755
--- a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
+++ b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization
@@ -567,7 +567,7 @@ case $1 in
 		prepare_board &
 
 		# add usb quirks
-		add_usb_storage_quirks &
+		# add_usb_storage_quirks &
 
 		# branch naming workaround
 		branch_naming_workaround &
diff --git a/scripts/distributions.sh b/scripts/distributions.sh
index 796f04b23596..974dd1da8c6c 100755
--- a/scripts/distributions.sh
+++ b/scripts/distributions.sh
@@ -746,6 +746,7 @@ install_distribution_specific()
 
 			# by using default lz4 initrd compression leads to corruption, go back to proven method
 			sed -i "s/^COMPRESS=.*/COMPRESS=gzip/" "${SDCARD}"/etc/initramfs-tools/initramfs.conf
+			echo -e "\n[Install]\nWantedBy=multi-user.target" >> "${SDCARD}"/lib/systemd/system/lightdm.service
 
 			# cleanup motd services and related files
 			chroot "${SDCARD}" /bin/bash -c "systemctl disable  motd-news.service >/dev/null 2>&1"