diff --git a/external/config/sources/families/meson-sm1.conf b/external/config/sources/families/meson-sm1.conf
index b1b3c38bc940..f89f53b47d8a 100644
--- a/external/config/sources/families/meson-sm1.conf
+++ b/external/config/sources/families/meson-sm1.conf
@@ -68,7 +68,6 @@ family_tweaks() {
 
 	chroot $SDCARD /bin/bash -c "apt-get -y -qq install usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
 
-	#install_docker
 	#install_balenaEtcher
 }
 
diff --git a/external/config/sources/families/rockchip-rk356x.conf b/external/config/sources/families/rockchip-rk356x.conf
index 5f4f7ed5e5ce..755d0d888c6f 100644
--- a/external/config/sources/families/rockchip-rk356x.conf
+++ b/external/config/sources/families/rockchip-rk356x.conf
@@ -54,7 +54,6 @@ family_tweaks_s() {
 		chroot $SDCARD /bin/bash -c "rm /etc/profile.d/im-config_wayland.sh" # for adbd
 	fi
 
-	install_docker
 	install_balenaEtcher
 	install_wiringop
 	if [[ -f ${SDCARD}/etc/pulse/default.pa && ${SELECTED_CONFIGURATION} == desktop && ${BOARD} =~ orangepicm4|orangepi3b ]]; then
diff --git a/external/config/sources/families/rockchip-rk3588.conf b/external/config/sources/families/rockchip-rk3588.conf
index 1cb89cbeb4fe..e35c558ff57c 100644
--- a/external/config/sources/families/rockchip-rk3588.conf
+++ b/external/config/sources/families/rockchip-rk3588.conf
@@ -145,7 +145,6 @@ family_tweaks_s() {
 	chroot $SDCARD /bin/bash -c "apt-get -y -qq install usb-modeswitch tree dnsmasq v4l-utils swig python3-dev python3-setuptools bluez libncurses-dev" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
 
 	install_wiringop
-	install_docker
 	install_balenaEtcher
 
 	# Board audio specific changes
diff --git a/external/config/sources/families/sun50iw9.conf b/external/config/sources/families/sun50iw9.conf
index 3dec4d2b303e..6e6ab0e5f753 100644
--- a/external/config/sources/families/sun50iw9.conf
+++ b/external/config/sources/families/sun50iw9.conf
@@ -101,7 +101,6 @@ family_tweaks_s()
 	fi
 
 	install_wiringop
-	install_docker
 }
 
 family_tweaks_bsp()
diff --git a/scripts/debootstrap.sh b/scripts/debootstrap.sh
index 170776aaba1b..02faf547a93a 100755
--- a/scripts/debootstrap.sh
+++ b/scripts/debootstrap.sh
@@ -328,6 +328,8 @@ create_rootfs_cache()
 			[[ ${PIPESTATUS[0]} -ne 0 ]] && exit_with_error "Installation of Orange Pi desktop packages for ${BRANCH} ${BOARD} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL} failed"
 		fi
 
+		install_docker
+
 		# Remove packages from packages.uninstall
 
 		display_alert "Uninstall packages" "$PACKAGE_LIST_UNINSTALL" "info"
diff --git a/scripts/general.sh b/scripts/general.sh
index f16fe12abc2a..4f35f8d3ac42 100755
--- a/scripts/general.sh
+++ b/scripts/general.sh
@@ -1901,11 +1901,11 @@ install_docker() {
 		;;
 	esac
 
-	if [[ ${SELECTED_CONFIGURATION} == desktop ]]; then
+	#if [[ ${SELECTED_CONFIGURATION} == desktop ]]; then
 		mirror_url=https://repo.huaweicloud.com
-	else
-		mirror_url=https://mirrors.aliyun.com
-	fi
+	#else
+	#	mirror_url=https://mirrors.aliyun.com
+	#fi
 
 	chroot "${SDCARD}" /bin/bash -c "curl -fsSL ${mirror_url}/docker-ce/linux/${distributor_id}/gpg | apt-key add -"
 	echo "deb [arch=${ARCH}] ${mirror_url}/docker-ce/linux/${distributor_id} ${RELEASE} stable" > "${SDCARD}"/etc/apt/sources.list.d/docker.list