diff --git a/config/desktop/hirsute/environments/i3-wm/armbian/create_desktop_package.sh b/config/desktop/focal/environments/i3-wm/armbian/create_desktop_package.sh
similarity index 100%
rename from config/desktop/hirsute/environments/i3-wm/armbian/create_desktop_package.sh
rename to config/desktop/focal/environments/i3-wm/armbian/create_desktop_package.sh
diff --git a/config/desktop/hirsute/environments/i3-wm/config_base/packages b/config/desktop/focal/environments/i3-wm/config_base/packages
similarity index 91%
rename from config/desktop/hirsute/environments/i3-wm/config_base/packages
rename to config/desktop/focal/environments/i3-wm/config_base/packages
index c3c423b279..2e409acd63 100644
--- a/config/desktop/hirsute/environments/i3-wm/config_base/packages
+++ b/config/desktop/focal/environments/i3-wm/config_base/packages
@@ -20,9 +20,9 @@ ghostscript-x inputattach kerneloops language-pack-en libatk-adaptor libgail-com
 spice-vdagent dictionaries-common hunspell-en-us 
 cups cups-bsd cups-client cups-filters system-config-printer system-config-printer-common printer-driver-all 
 samba smbclient cifs-utils 
-ubuntu-drivers-common ubuntu-docs ubuntu-wallpapers ubuntu-wallpapers-hirsute ttf-ubuntu-font-family fonts-ubuntu-font-family-console 
+ubuntu-drivers-common ubuntu-docs ubuntu-wallpapers ttf-ubuntu-font-family fonts-ubuntu-font-family-console 
 tracker tracker-extract tracker-miner-fs update-inetd update-manager update-manager-core update-notifier update-notifier-common 
-laptop-detect usb-creator-common usb-creator-gtk overlay-scrollbar overlay-scrollbar-gtk2 
+laptop-detect overlay-scrollbar overlay-scrollbar-gtk2 
 gnome-system-monitor gnome-system-tools gnome-power-manager gnome-orca evince evince-common caffeine lxappearance gdebi 
 apport-gtk dmz-cursor-theme libgsettings-qt1 libappindicator3-1 gir1.2-appindicator3-0.1 gromit 
 totem totem-common totem-plugins
diff --git a/config/desktop/hirsute/environments/i3-wm/config_base/packages.uninstall b/config/desktop/focal/environments/i3-wm/config_base/packages.uninstall
similarity index 100%
rename from config/desktop/hirsute/environments/i3-wm/config_base/packages.uninstall
rename to config/desktop/focal/environments/i3-wm/config_base/packages.uninstall
diff --git a/config/desktop/hirsute/environments/i3-wm/debian/postinst b/config/desktop/focal/environments/i3-wm/debian/postinst
similarity index 100%
rename from config/desktop/hirsute/environments/i3-wm/debian/postinst
rename to config/desktop/focal/environments/i3-wm/debian/postinst
diff --git a/config/desktop/hirsute/environments/i3-wm/support b/config/desktop/focal/environments/i3-wm/support
similarity index 100%
rename from config/desktop/hirsute/environments/i3-wm/support
rename to config/desktop/focal/environments/i3-wm/support
diff --git a/config/desktop/hirsute/environments/i3-wm b/config/desktop/hirsute/environments/i3-wm
new file mode 120000
index 0000000000..b198ea73e7
--- /dev/null
+++ b/config/desktop/hirsute/environments/i3-wm
@@ -0,0 +1 @@
+../../focal/environments/i3-wm
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/i3-wm/only_for b/config/desktop/hirsute/environments/i3-wm/only_for
deleted file mode 100644
index d400067581..0000000000
--- a/config/desktop/hirsute/environments/i3-wm/only_for
+++ /dev/null
@@ -1 +0,0 @@
-arm64
diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh
index 2d2f5dde23..96dfa46be8 100644
--- a/lib/debootstrap.sh
+++ b/lib/debootstrap.sh
@@ -180,6 +180,7 @@ create_rootfs_cache()
 
 
 		display_alert "Installing base system" "Stage 1/2" "info"
+		cd $SDCARD # this will prevent error sh: 0: getcwd() failed
 		eval 'debootstrap --variant=minbase --include=${DEBOOTSTRAP_LIST// /,} ${PACKAGE_LIST_EXCLUDE:+ --exclude=${PACKAGE_LIST_EXCLUDE// /,}} \
 			--arch=$ARCH --components=${DEBOOTSTRAP_COMPONENTS} $DEBOOTSTRAP_OPTION --foreign $RELEASE $SDCARD/ $apt_mirror' \
 			${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \