diff --git a/lib/configuration.sh b/lib/configuration.sh
index 5953e59c37..3ab7a43f53 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -240,10 +240,10 @@ case $RELEASE in
 
 	focal)
 		DEBOOTSTRAP_COMPONENTS="main,universe"
-		DEBOOTSTRAP_LIST+=" rng-tools debian-archive-keyring fdisk"
+		DEBOOTSTRAP_LIST+=" rng-tools fdisk"
 		[[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE="man-db kbd net-tools gnupg2 dirmngr networkd-dispatcher selinux-policy-default"
 		PACKAGE_LIST_DESKTOP+=" xserver-xorg-input-all paprefs dbus-x11 pulseaudio-module-gsettings onboard"
-		PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium system-config-printer-common system-config-printer \
+		PACKAGE_LIST_DESKTOP_RECOMMENDS+=" firefox system-config-printer-common system-config-printer \
 								language-selector-gnome viewnior"
 		PACKAGE_LIST_DESKTOP_FULL+=" thunderbird"
 		PACKAGE_LIST_PREDEPENDS="policykit-1-gnome notification-daemon"
@@ -254,7 +254,7 @@ case $RELEASE in
 		DEBOOTSTRAP_LIST+=" rng-tools fdisk"
 		[[ -z $BUILD_MINIMAL || $BUILD_MINIMAL == no ]] && PACKAGE_LIST_RELEASE="man-db kbd net-tools gnupg2 dirmngr networkd-dispatcher selinux-policy-default"
 		PACKAGE_LIST_DESKTOP+=" xserver-xorg-input-all paprefs dbus-x11 pulseaudio-module-gsettings onboard"
-		PACKAGE_LIST_DESKTOP_RECOMMENDS+=" chromium system-config-printer-common system-config-printer \
+		PACKAGE_LIST_DESKTOP_RECOMMENDS+=" firefox system-config-printer-common system-config-printer \
 								language-selector-gnome mirage"
 		PACKAGE_LIST_DESKTOP_FULL+=" thunderbird"
 		PACKAGE_LIST_PREDEPENDS="policykit-1-gnome notification-daemon"
diff --git a/lib/general.sh b/lib/general.sh
index 1a03e34b8f..7dd6e4ff85 100644
--- a/lib/general.sh
+++ b/lib/general.sh
@@ -171,36 +171,6 @@ create_sources_list()
 	;;
 	esac
 
-	# workaround for Chromium by downloading it from Debian
-	if [[ $release == focal || $release == eoan ]]; then
-
-		cat <<-EOF > "${basedir}"/etc/apt/preferences.d/chromium.pref
-		# Note: 2 blank lines are required between entries
-		Package: *
-		Pin: release a=${release}
-		Pin-Priority: 500
-
-		Package: *
-		Pin: origin "${DEBIAN_MIRROR//\/debian}"
-		Pin-Priority: 300
-
-		# Pattern includes 'chromium', 'chromium-browser' and similarly
-		# named dependencies:
-		Package: chromium*
-		Pin: origin "${DEBIAN_MIRROR//\/debian}"
-		Pin-Priority: 700
-		EOF
-
-		cat <<-EOF > "${basedir}"/etc/apt/sources.list.d/debian.list
-		deb http://${DEBIAN_MIRROR} stable main
-		deb http://${DEBIAN_MIRROR} stable-updates main
-		deb http://${DEBIAN_MIRROR}-security stable/updates main
-		EOF
-
-		chroot "${SDCARD}" /bin/bash -c "apt-key add /usr/share/keyrings/debian-archive-keyring.gpg >/dev/null 2>&1"
-
-	fi
-
 	# stage: add armbian repository and install key
 	if [[ $DOWNLOAD_MIRROR == "china" ]]; then
 		echo "deb http://mirrors.tuna.tsinghua.edu.cn/armbian $RELEASE main ${RELEASE}-utils ${RELEASE}-desktop" > "${SDCARD}"/etc/apt/sources.list.d/armbian.list