diff --git a/README.md b/README.md
index 60f6cd74e..617d33232 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ build framework</h3>
 ## What do you need to get started?
 
 - x64 / aarch64 machine with at least 2GB of memory and ~35GB of disk space for a VM, container or native OS,
-- Ubuntu Hirsute 21.04 x64 / aarch64 for native building or any [Docker](https://docs.armbian.com/Developer-Guide_Building-with-Docker/) capable x64 / aarch64 Linux for containerised,
+- Ubuntu Jammy 22.04 x64 / aarch64 for native building or any [Docker](https://docs.armbian.com/Developer-Guide_Building-with-Docker/) capable x64 / aarch64 Linux for containerised,
 - superuser rights (configured sudo or root access).
 
 <p align=right><a href=#table-of-contents>⇧</a></p>
diff --git a/config/cli/bionic b/config/cli/bionic
deleted file mode 120000
index aae2fdcd7..000000000
--- a/config/cli/bionic
+++ /dev/null
@@ -1 +0,0 @@
-focal
\ No newline at end of file
diff --git a/config/cli/hirsute b/config/cli/hirsute
deleted file mode 120000
index aae2fdcd7..000000000
--- a/config/cli/hirsute
+++ /dev/null
@@ -1 +0,0 @@
-focal
\ No newline at end of file
diff --git a/config/cli/impish/debootstrap b/config/cli/impish/debootstrap
deleted file mode 120000
index 70a5776e2..000000000
--- a/config/cli/impish/debootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../focal/debootstrap
\ No newline at end of file
diff --git a/config/cli/impish/main/config_cli_standard b/config/cli/impish/main/config_cli_standard
deleted file mode 120000
index c7fe3c166..000000000
--- a/config/cli/impish/main/config_cli_standard
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/main/config_cli_standard
\ No newline at end of file
diff --git a/config/cli/impish/main/config_desktop b/config/cli/impish/main/config_desktop
deleted file mode 120000
index e22162e48..000000000
--- a/config/cli/impish/main/config_desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/main/config_desktop
\ No newline at end of file
diff --git a/config/cli/impish/main/packages b/config/cli/impish/main/packages
deleted file mode 120000
index fa3862360..000000000
--- a/config/cli/impish/main/packages
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/main/packages
\ No newline at end of file
diff --git a/config/cli/impish/main/packages.additional b/config/cli/impish/main/packages.additional
deleted file mode 100644
index 83f52bf87..000000000
--- a/config/cli/impish/main/packages.additional
+++ /dev/null
@@ -1,18 +0,0 @@
-cracklib-runtime
-curl
-htop
-i2c-tools
-jq
-libcrack2
-lsof
-mc
-mmc-utils
-nano
-net-tools
-netplan.io
-network-manager
-network-manager-openvpn
-resolvconf
-sysstat
-wget
-wireless-tools
diff --git a/config/desktop/bionic/appgroups/chat b/config/desktop/bionic/appgroups/chat
deleted file mode 120000
index 32416fca1..000000000
--- a/config/desktop/bionic/appgroups/chat
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/chat
\ No newline at end of file
diff --git a/config/desktop/bionic/appgroups/editors/debian/postinst b/config/desktop/bionic/appgroups/editors/debian/postinst
deleted file mode 100644
index e69de29bb..000000000
diff --git a/config/desktop/bionic/appgroups/editors/packages b/config/desktop/bionic/appgroups/editors/packages
deleted file mode 100644
index 15a82c709..000000000
--- a/config/desktop/bionic/appgroups/editors/packages
+++ /dev/null
@@ -1,2 +0,0 @@
-emacs
-vim
diff --git a/config/desktop/bionic/appgroups/email b/config/desktop/bionic/appgroups/email
deleted file mode 120000
index 1df4a1969..000000000
--- a/config/desktop/bionic/appgroups/email
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/email
\ No newline at end of file
diff --git a/config/desktop/bionic/appgroups/internet b/config/desktop/bionic/appgroups/internet
deleted file mode 120000
index 9962013cf..000000000
--- a/config/desktop/bionic/appgroups/internet
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/internet
\ No newline at end of file
diff --git a/config/desktop/bionic/appgroups/multimedia/packages b/config/desktop/bionic/appgroups/multimedia/packages
deleted file mode 100644
index 14bb93350..000000000
--- a/config/desktop/bionic/appgroups/multimedia/packages
+++ /dev/null
@@ -1,2 +0,0 @@
-gimp
-mpv
diff --git a/config/desktop/bionic/appgroups/office b/config/desktop/bionic/appgroups/office
deleted file mode 120000
index f3b2e2e9d..000000000
--- a/config/desktop/bionic/appgroups/office
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/office
\ No newline at end of file
diff --git a/config/desktop/bionic/appgroups/remote_desktop b/config/desktop/bionic/appgroups/remote_desktop
deleted file mode 120000
index bdac8eaee..000000000
--- a/config/desktop/bionic/appgroups/remote_desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/remote_desktop
\ No newline at end of file
diff --git a/config/desktop/bionic/environments/xfce/appgroups b/config/desktop/bionic/environments/xfce/appgroups
deleted file mode 120000
index cd5891083..000000000
--- a/config/desktop/bionic/environments/xfce/appgroups
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/xfce/appgroups
\ No newline at end of file
diff --git a/config/desktop/bionic/environments/xfce/armbian b/config/desktop/bionic/environments/xfce/armbian
deleted file mode 120000
index 4f0599195..000000000
--- a/config/desktop/bionic/environments/xfce/armbian
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/xfce/armbian
\ No newline at end of file
diff --git a/config/desktop/bionic/environments/xfce/config_base/packages b/config/desktop/bionic/environments/xfce/config_base/packages
deleted file mode 100644
index 176b5a3e0..000000000
--- a/config/desktop/bionic/environments/xfce/config_base/packages
+++ /dev/null
@@ -1,168 +0,0 @@
-anacron
-apport-gtk
-blueman
-bluez
-bluez-cups
-bluez-tools
-brltty
-brltty-x11
-caffeine
-cifs-utils
-cups
-cups-bsd
-cups-client
-cups-filters
-dbus-x11
-dictionaries-common
-dmz-cursor-theme
-doc-base
-evince
-evince-common
-fontconfig
-fontconfig-config
-fonts-arphic-ukai
-fonts-arphic-uming
-fonts-dejavu-core
-fonts-freefont-ttf
-fonts-guru
-fonts-guru-extra
-fonts-kacst
-fonts-kacst-one
-fonts-khmeros-core
-fonts-liberation
-fonts-nanum
-fonts-opensymbol
-fonts-stix
-fonts-symbola
-fonts-ubuntu-font-family-console
-foomatic-db-compressed-ppds
-gdebi
-ghostscript-x
-gir1.2-appindicator3-0.1
-gnome-font-viewer
-gnome-screenshot
-gnome-user-docs-de
-gnome-user-docs-es
-gnome-user-docs-it
-gnome-user-docs-pt
-gnome-user-docs-ru
-gnome-user-docs-sl
-gstreamer1.0-packagekit
-gstreamer1.0-plugins-base-apps
-gstreamer1.0-pulseaudio
-gtk2-engines
-gtk2-engines-murrine
-gtk2-engines-pixbuf
-gvfs-backends
-hplip
-hunspell-en-us
-indicator-printers
-inputattach
-kerneloops
-keyutils
-language-pack-gnome-de
-language-pack-gnome-en
-language-pack-gnome-es
-language-pack-gnome-fr
-language-pack-gnome-it
-language-pack-gnome-pt
-language-pack-gnome-ru
-language-pack-gnome-sl
-laptop-detect
-libappindicator3-1
-libatk-adaptor
-libfont-afm-perl
-libfontconfig1
-libfontembed1
-libfontenc1
-libgail-common
-libgl1-mesa-dri
-libgsettings-qt1
-libgtk2.0-bin
-libnotify-bin
-libpam-gnome-keyring
-libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
-libu2f-udev
-libwmf0.2-7-gtk
-libxcursor1
-lightdm
-lightdm-settings
-lxtask
-mesa-utils
-mousepad
-mousetweaks
-network-manager-gnome
-network-manager-l2tp
-network-manager-openconnect
-network-manager-openvpn
-network-manager-pptp
-network-manager-ssh
-network-manager-vpnc
-numix-gtk-theme
-numix-icon-theme
-openprinting-ppds
-orca
-p7zip-full
-pamix
-pasystray
-pavucontrol
-pavucontrol-qt
-pavumeter
-pinta
-policykit-1
-policykit-desktop-privileges
-printer-driver-all
-profile-sync-daemon
-pulseaudio-module-bluetooth
-redshift
-slick-greeter
-smbclient
-software-properties-gtk
-spice-vdagent
-system-config-printer
-system-config-printer-common
-terminator
-thunar-volman
-ttf-ubuntu-font-family
-ubuntu-drivers-common
-update-inetd
-update-manager
-update-manager-core
-update-notifier
-update-notifier-common
-viewnior
-wamerican
-wbrazilian
-wbritish
-wfrench
-witalian
-wportuguese
-wspanish
-wswiss
-x11-apps
-x11-xserver-utils
-xarchiver
-xbacklight
-xcursor-themes
-xdg-user-dirs
-xdg-user-dirs-gtk
-xfce4
-xfce4-notifyd
-xfce4-screenshooter
-xfce4-terminal
-xfonts-100dpi
-xfonts-75dpi
-xfonts-base
-xfonts-encodings
-xfonts-scalable
-xfonts-utils
-xinit
-xorg-docs-core
-xscreensaver
-xserver-xorg
-xserver-xorg-video-fbdev
-xterm
-xtermcontrol
-xtermset
-zip
diff --git a/config/desktop/bionic/environments/xfce/config_base/packages.uninstall b/config/desktop/bionic/environments/xfce/config_base/packages.uninstall
deleted file mode 120000
index 5be3fde23..000000000
--- a/config/desktop/bionic/environments/xfce/config_base/packages.uninstall
+++ /dev/null
@@ -1 +0,0 @@
-../../../../focal/environments/xfce/config_base/packages.uninstall
\ No newline at end of file
diff --git a/config/desktop/bionic/environments/xfce/debian b/config/desktop/bionic/environments/xfce/debian
deleted file mode 120000
index cc6b8f653..000000000
--- a/config/desktop/bionic/environments/xfce/debian
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/xfce/debian
\ No newline at end of file
diff --git a/config/desktop/bionic/environments/xfce/support b/config/desktop/bionic/environments/xfce/support
deleted file mode 120000
index cf4c5d782..000000000
--- a/config/desktop/bionic/environments/xfce/support
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/xfce/support
\ No newline at end of file
diff --git a/config/desktop/hirsute/appgroups b/config/desktop/hirsute/appgroups
deleted file mode 120000
index 97784daa0..000000000
--- a/config/desktop/hirsute/appgroups
+++ /dev/null
@@ -1 +0,0 @@
-../focal/appgroups
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/budgie b/config/desktop/hirsute/environments/budgie
deleted file mode 120000
index 03309a752..000000000
--- a/config/desktop/hirsute/environments/budgie
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/budgie
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/cinnamon b/config/desktop/hirsute/environments/cinnamon
deleted file mode 120000
index 5cb429269..000000000
--- a/config/desktop/hirsute/environments/cinnamon
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/cinnamon
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/gnome/armbian b/config/desktop/hirsute/environments/gnome/armbian
deleted file mode 120000
index 3adcf2a0e..000000000
--- a/config/desktop/hirsute/environments/gnome/armbian
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/gnome/armbian
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/gnome/config_base/packages b/config/desktop/hirsute/environments/gnome/config_base/packages
deleted file mode 100644
index 5cef53553..000000000
--- a/config/desktop/hirsute/environments/gnome/config_base/packages
+++ /dev/null
@@ -1,216 +0,0 @@
-alsa-base
-anacron
-at-spi2-core
-bubblewrap
-cups
-dbus-x11
-dictionaries-common
-dmz-cursor-theme
-evolution-data-server
-evolution-data-server-common
-fonts-freefont-ttf
-fonts-urw-base35
-foomatic-db-compressed-ppds
-gconf2
-gcr
-gdebi
-gdm3
-genisoimage
-geoclue-2.0
-ghostscript
-ghostscript-x
-gir1.2-accountsservice-1.0
-gir1.2-atspi-2.0
-gir1.2-gck-1
-gir1.2-gcr-3
-gir1.2-gdesktopenums-3.0
-gir1.2-gdm-1.0
-gir1.2-geoclue-2.0
-gir1.2-gnomebluetooth-1.0
-gir1.2-gnomedesktop-3.0
-gir1.2-goa-1.0
-gir1.2-graphene-1.0
-gir1.2-gweather-3.0
-gir1.2-ibus-1.0
-gir1.2-json-1.0
-gir1.2-mutter-7
-gir1.2-nm-1.0
-gir1.2-nma-1.0
-gir1.2-polkit-1.0
-gir1.2-rsvg-2.0
-gir1.2-snapd-1
-gir1.2-soup-2.4
-gir1.2-upowerglib-1.0
-gjs
-gnome-control-center
-gnome-desktop3-data
-gnome-keyring
-gnome-menus
-gnome-session
-gnome-session-bin
-gnome-session-common
-gnome-settings-daemon
-gnome-settings-daemon-common
-gnome-shell
-gnome-shell-common
-gnome-shell-extension-appindicator
-gnome-shell-extension-desktop-icons
-gnome-shell-extension-trash
-gvfs-backends
-hunspell-en-us
-inputattach
-libaccountsservice0
-libasound2-plugins
-libaspell15
-libatk-adaptor
-libcairo-gobject-perl
-libcairo-perl
-libcamel-1.2-62
-libcue2
-libdee-1.0-4
-libebackend-1.2-10
-libebook-1.2-20
-libebook-contacts-1.2-3
-libecal-2.0-1
-libedata-book-1.2-26
-libedata-cal-2.0-1
-libedataserver-1.2-26
-libedataserverui-1.2-3
-libenchant-2-2
-libexempi8
-libexiv2-27
-libextutils-depends-perl
-libextutils-pkgconfig-perl
-libfontenc1
-libgck-1-0
-libgcr-base-3-1
-libgcr-ui-3-1
-libgdata22
-libgdata-common
-libgdm1
-libgeoclue-2-0
-libgeocode-glib0
-libgexiv2-2
-libgjs0g
-libglib-object-introspection-perl
-libglib-perl
-libglu1-mesa
-libgnome-autoar-0-0
-libgnome-bluetooth13
-libgnome-desktop-3-19
-libgoa-1.0-0b
-libgoa-1.0-common
-libgraphene-1.0-0
-libgs9
-libgs9-common
-libgsf-1-114
-libgsf-1-common
-libgtk3-perl
-libgweather-3-16
-libgweather-common
-libgxps2
-libibus-1.0-5
-libical3
-libidn11
-libijs-0.35
-libimobiledevice6
-libjavascriptcoregtk-4.0-18
-libjbig2dec0
-libmutter-7-0
-libnautilus-extension1a
-libnma0
-libnotify-bin
-libpaper1
-libphonenumber8
-libplist3
-libpoppler-glib8
-libprotobuf23
-libpulsedsp
-libsasl2-modules
-libspeexdsp1
-libtext-iconv-perl
-libtotem-plparser18
-libtotem-plparser-common
-libtracker-control-2.0-0
-libtracker-miner-2.0-0
-libtracker-sparql-2.0-0
-libu2f-udev
-libunity9
-libunity-protocol-private0
-libunity-scopes-json-def-desktop
-libunwind8
-libupower-glib3
-libusbmuxd6
-libwebkit2gtk-4.0-37
-libxaw7
-libxfont2
-libxkbfile1
-libxmu6
-libxmuu1
-libxtst6
-libxxf86dga1
-libyelp0
-linux-sound-base
-mutter
-mutter-common
-nautilus
-nautilus-data
-openprinting-ppds
-p11-kit
-p11-kit-modules
-pavucontrol
-pinentry-gnome3
-poppler-data
-printer-driver-pnm2ppa
-pulseaudio
-pulseaudio-module-bluetooth
-pulseaudio-utils
-python3-click
-python3-colorama
-python3-dateutil
-python3-debconf
-python3-debian
-python3-distupgrade
-python3-update-manager
-python3-xkit
-python3-yaml
-software-properties-gtk
-spice-vdagent
-system-config-printer-gnome
-terminator
-tracker
-tracker-extract
-tracker-miner-fs
-ubuntu-business-defaults
-ubuntu-desktop-minimal
-ubuntu-session
-ubuntu-settings
-update-manager
-update-manager-core
-update-notifier
-update-notifier-common
-upower
-x11-apps
-x11-session-utils
-x11-utils
-x11-xkb-utils
-x11-xserver-utils
-xarchiver
-xdg-dbus-proxy
-xdg-desktop-portal
-xdg-user-dirs
-xdg-user-dirs-gtk
-xfonts-base
-xinit
-xinput
-xorg
-xorg-docs-core
-xserver-common
-xserver-xorg
-xserver-xorg-video-fbdev
-xwayland
-yaru-theme-gnome-shell
-yelp
-yelp-xsl
-zenity
-zenity-common
diff --git a/config/desktop/hirsute/environments/gnome/debian b/config/desktop/hirsute/environments/gnome/debian
deleted file mode 120000
index 68b05869b..000000000
--- a/config/desktop/hirsute/environments/gnome/debian
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/gnome/debian
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/gnome/only_for b/config/desktop/hirsute/environments/gnome/only_for
deleted file mode 120000
index 6b2dee246..000000000
--- a/config/desktop/hirsute/environments/gnome/only_for
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/gnome/only_for
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/gnome/support b/config/desktop/hirsute/environments/gnome/support
deleted file mode 120000
index fe28f381d..000000000
--- a/config/desktop/hirsute/environments/gnome/support
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/environments/gnome/support
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/i3-wm b/config/desktop/hirsute/environments/i3-wm
deleted file mode 120000
index b198ea73e..000000000
--- a/config/desktop/hirsute/environments/i3-wm
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/i3-wm
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/kde-plasma b/config/desktop/hirsute/environments/kde-plasma
deleted file mode 120000
index 40255817b..000000000
--- a/config/desktop/hirsute/environments/kde-plasma
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/kde-plasma
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/mate b/config/desktop/hirsute/environments/mate
deleted file mode 120000
index 1defe21ee..000000000
--- a/config/desktop/hirsute/environments/mate
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/mate
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/xfce b/config/desktop/hirsute/environments/xfce
deleted file mode 120000
index e48eb6dc1..000000000
--- a/config/desktop/hirsute/environments/xfce
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/xfce
\ No newline at end of file
diff --git a/config/desktop/hirsute/environments/xmonad b/config/desktop/hirsute/environments/xmonad
deleted file mode 120000
index 8f92a94e7..000000000
--- a/config/desktop/hirsute/environments/xmonad
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/xmonad
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/3dsupport/packages b/config/desktop/impish/appgroups/3dsupport/packages
deleted file mode 120000
index 6e36910cb..000000000
--- a/config/desktop/impish/appgroups/3dsupport/packages
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/appgroups/3dsupport/packages
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.gpg b/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.gpg
deleted file mode 100644
index b5a8ebbf6..000000000
Binary files a/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.gpg and /dev/null differ
diff --git a/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source b/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source
deleted file mode 100644
index a9f65c90a..000000000
--- a/config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ impish main
diff --git a/config/desktop/impish/appgroups/browsers/armbian b/config/desktop/impish/appgroups/browsers/armbian
deleted file mode 120000
index 6c54c7f4d..000000000
--- a/config/desktop/impish/appgroups/browsers/armbian
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/appgroups/browsers/armbian
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/browsers/debian b/config/desktop/impish/appgroups/browsers/debian
deleted file mode 120000
index b7a68e9df..000000000
--- a/config/desktop/impish/appgroups/browsers/debian
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/appgroups/browsers/debian
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/browsers/packages b/config/desktop/impish/appgroups/browsers/packages
deleted file mode 120000
index 5bfe93b11..000000000
--- a/config/desktop/impish/appgroups/browsers/packages
+++ /dev/null
@@ -1 +0,0 @@
-../../../focal/appgroups/browsers/packages
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.gpg b/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.gpg
deleted file mode 100644
index 95cf6bbd3..000000000
Binary files a/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.gpg and /dev/null differ
diff --git a/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.source b/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.source
deleted file mode 100644
index 25177af82..000000000
--- a/config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.source
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/chromium-browser.gpg] http://ppa.launchpadcontent.net/saiarcot895/chromium-dev/ubuntu/ impish main
diff --git a/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.gpg b/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.gpg
deleted file mode 100644
index 1384255d9..000000000
Binary files a/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.gpg and /dev/null differ
diff --git a/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source b/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source
deleted file mode 100644
index 786834d46..000000000
--- a/config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source
+++ /dev/null
@@ -1 +0,0 @@
-deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ impish main
diff --git a/config/desktop/impish/appgroups/chat b/config/desktop/impish/appgroups/chat
deleted file mode 120000
index 32416fca1..000000000
--- a/config/desktop/impish/appgroups/chat
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/chat
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/desktop_tools b/config/desktop/impish/appgroups/desktop_tools
deleted file mode 120000
index 9135d2858..000000000
--- a/config/desktop/impish/appgroups/desktop_tools
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/desktop_tools
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/editors b/config/desktop/impish/appgroups/editors
deleted file mode 120000
index 5c5c21c05..000000000
--- a/config/desktop/impish/appgroups/editors
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/editors
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/email b/config/desktop/impish/appgroups/email
deleted file mode 120000
index 1df4a1969..000000000
--- a/config/desktop/impish/appgroups/email
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/email
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/internet b/config/desktop/impish/appgroups/internet
deleted file mode 120000
index 9962013cf..000000000
--- a/config/desktop/impish/appgroups/internet
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/internet
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/multimedia b/config/desktop/impish/appgroups/multimedia
deleted file mode 120000
index 8af025216..000000000
--- a/config/desktop/impish/appgroups/multimedia
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/multimedia
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/office b/config/desktop/impish/appgroups/office
deleted file mode 120000
index f3b2e2e9d..000000000
--- a/config/desktop/impish/appgroups/office
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/office
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/programming b/config/desktop/impish/appgroups/programming
deleted file mode 120000
index 0f5ee0d7c..000000000
--- a/config/desktop/impish/appgroups/programming
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/programming
\ No newline at end of file
diff --git a/config/desktop/impish/appgroups/remote_desktop b/config/desktop/impish/appgroups/remote_desktop
deleted file mode 120000
index bdac8eaee..000000000
--- a/config/desktop/impish/appgroups/remote_desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/appgroups/remote_desktop
\ No newline at end of file
diff --git a/config/desktop/impish/environments/budgie/armbian/create_desktop_package.sh b/config/desktop/impish/environments/budgie/armbian/create_desktop_package.sh
deleted file mode 120000
index a928e9618..000000000
--- a/config/desktop/impish/environments/budgie/armbian/create_desktop_package.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../focal/environments/budgie/armbian/create_desktop_package.sh
\ No newline at end of file
diff --git a/config/desktop/impish/environments/budgie/config_base/packages b/config/desktop/impish/environments/budgie/config_base/packages
deleted file mode 100644
index 50e67b672..000000000
--- a/config/desktop/impish/environments/budgie/config_base/packages
+++ /dev/null
@@ -1,199 +0,0 @@
-anacron
-apport-gtk
-blueman
-bluez
-bluez-cups
-bluez-tools
-brltty
-brltty-x11
-budgie-app-launcher-applet
-budgie-applications-menu-applet
-budgie-appmenu-applet
-budgie-brightness-controller-applet
-budgie-clockworks-applet
-budgie-countdown-applet
-budgie-desktop
-budgie-desktop-doc
-budgie-desktop-environment
-budgie-dropby-applet
-budgie-extras-common
-budgie-extras-daemon
-budgie-fuzzyclock-applet
-budgie-hotcorners-applet
-budgie-indicator-applet
-budgie-kangaroo-applet
-budgie-keyboard-autoswitch-applet
-budgie-network-manager-applet
-budgie-previews
-budgie-previews-applet
-budgie-quickchar
-budgie-quicknote-applet
-budgie-recentlyused-applet
-budgie-rotation-lock-applet
-budgie-showtime-applet
-budgie-sntray-plugin
-budgie-takeabreak-applet
-budgie-trash-applet
-budgie-visualspace-applet
-budgie-wallpapers-focal
-budgie-wallstreet
-budgie-weathershow-applet
-budgie-welcome
-budgie-window-mover-applet
-budgie-window-shuffler
-budgie-workspace-overview-applet
-budgie-workspace-stopwatch-applet
-caffeine
-cifs-utils
-cups
-cups-bsd
-cups-client
-cups-filters
-dbus-x11
-dictionaries-common
-doc-base
-evince
-evince-common
-fontconfig
-fontconfig-config
-fonts-noto-mono
-fonts-ubuntu-font-family-console
-foomatic-db-compressed-ppds
-gdebi
-ghostscript-x
-gir1.2-appindicator3-0.1
-gnome-orca
-gnome-screenshot
-gnome-tweaks
-gnome-user-docs-de
-gnome-user-docs-es
-gnome-user-docs-it
-gnome-user-docs-pt
-gnome-user-docs-ru
-gnome-user-docs-sl
-gstreamer1.0-packagekit
-gstreamer1.0-plugins-base-apps
-gstreamer1.0-pulseaudio
-gtk2-engines
-gtk2-engines-murrine
-gtk2-engines-pixbuf
-gvfs-backends
-hplip
-hunspell-en-us
-indicator-printers
-inputattach
-kerneloops
-keyutils
-language-pack-gnome-de
-language-pack-gnome-en
-language-pack-gnome-es
-language-pack-gnome-fr
-language-pack-gnome-it
-language-pack-gnome-pt
-language-pack-gnome-ru
-language-pack-gnome-sl
-laptop-detect
-libappindicator3-1
-libatk-adaptor
-libcvc0
-libfont-afm-perl
-libfontconfig1
-libfontembed1
-libfontenc1
-libgail-common
-libgl1-mesa-dri
-libgsettings-qt1
-libgtk2.0-bin
-libnotify-bin
-libplank1
-libplank-common
-libproxy1-plugin-gsettings
-libproxy1-plugin-networkmanager
-libu2f-udev
-libwmf0.2-7-gtk
-libxcursor1
-lightdm
-lightdm-settings
-mesa-utils
-mousepad
-mousetweaks
-nemo
-nemo-data
-nemo-fileroller
-nemo-font-manager
-nemo-gtkhash
-network-manager-config-connectivity-ubuntu
-network-manager-l2tp
-network-manager-openconnect
-network-manager-openvpn
-network-manager-pptp
-network-manager-ssh
-network-manager-vpnc
-numix-blue-gtk-theme
-numix-gtk-theme
-numix-icon-theme
-numix-icon-theme-circle
-openprinting-ppds
-p7zip-full
-pamix
-pasystray
-pavucontrol
-pavucontrol-qt
-pavumeter
-plank
-policykit-1
-policykit-1-gnome
-policykit-desktop-privileges
-printer-driver-all
-profile-sync-daemon
-pulseaudio-module-bluetooth
-redshift
-samba
-slick-greeter
-smbclient
-software-properties-gtk
-spice-vdagent
-system-config-printer
-system-config-printer-common
-terminator
-tracker-extract
-tracker-miner-fs
-ttf-ubuntu-font-family
-ubuntu-drivers-common
-update-inetd
-update-manager
-update-manager-core
-update-notifier
-update-notifier-common
-viewnior
-wamerican
-wbrazilian
-wbritish
-wfrench
-witalian
-wportuguese
-wspanish
-wswiss
-x11-apps
-x11-xserver-utils
-xarchiver
-xbacklight
-xcursor-themes
-xdg-user-dirs
-xdg-user-dirs-gtk
-xfonts-100dpi
-xfonts-75dpi
-xfonts-base
-xfonts-encodings
-xfonts-scalable
-xfonts-utils
-xinit
-xorg-docs-core
-xscreensaver
-xserver-xorg
-xserver-xorg-video-fbdev
-xterm
-xtermcontrol
-xtermset
-xwallpaper
-zip
diff --git a/config/desktop/impish/environments/budgie/config_base/packages.uninstall b/config/desktop/impish/environments/budgie/config_base/packages.uninstall
deleted file mode 120000
index 576c812ef..000000000
--- a/config/desktop/impish/environments/budgie/config_base/packages.uninstall
+++ /dev/null
@@ -1 +0,0 @@
-../../../../focal/environments/budgie/config_base/packages.uninstall
\ No newline at end of file
diff --git a/config/desktop/impish/environments/budgie/debian/postinst b/config/desktop/impish/environments/budgie/debian/postinst
deleted file mode 120000
index 00ed651ab..000000000
--- a/config/desktop/impish/environments/budgie/debian/postinst
+++ /dev/null
@@ -1 +0,0 @@
-../../../../focal/environments/budgie/debian/postinst
\ No newline at end of file
diff --git a/config/desktop/impish/environments/budgie/only_for b/config/desktop/impish/environments/budgie/only_for
deleted file mode 100644
index 54b43c7a5..000000000
--- a/config/desktop/impish/environments/budgie/only_for
+++ /dev/null
@@ -1 +0,0 @@
-arm64, amd64
diff --git a/config/desktop/impish/environments/budgie/support b/config/desktop/impish/environments/budgie/support
deleted file mode 100644
index a23e5fb94..000000000
--- a/config/desktop/impish/environments/budgie/support
+++ /dev/null
@@ -1 +0,0 @@
-supported
diff --git a/config/desktop/impish/environments/cinnamon b/config/desktop/impish/environments/cinnamon
deleted file mode 120000
index 5cb429269..000000000
--- a/config/desktop/impish/environments/cinnamon
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/cinnamon
\ No newline at end of file
diff --git a/config/desktop/impish/environments/gnome b/config/desktop/impish/environments/gnome
deleted file mode 120000
index 921b0cde8..000000000
--- a/config/desktop/impish/environments/gnome
+++ /dev/null
@@ -1 +0,0 @@
-../../hirsute/environments/gnome
\ No newline at end of file
diff --git a/config/desktop/impish/environments/i3-wm b/config/desktop/impish/environments/i3-wm
deleted file mode 120000
index b198ea73e..000000000
--- a/config/desktop/impish/environments/i3-wm
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/i3-wm
\ No newline at end of file
diff --git a/config/desktop/impish/environments/kde-plasma b/config/desktop/impish/environments/kde-plasma
deleted file mode 120000
index 40255817b..000000000
--- a/config/desktop/impish/environments/kde-plasma
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/kde-plasma
\ No newline at end of file
diff --git a/config/desktop/impish/environments/mate b/config/desktop/impish/environments/mate
deleted file mode 120000
index 1defe21ee..000000000
--- a/config/desktop/impish/environments/mate
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/mate
\ No newline at end of file
diff --git a/config/desktop/impish/environments/xfce b/config/desktop/impish/environments/xfce
deleted file mode 120000
index e48eb6dc1..000000000
--- a/config/desktop/impish/environments/xfce
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/xfce
\ No newline at end of file
diff --git a/config/desktop/impish/environments/xmonad b/config/desktop/impish/environments/xmonad
deleted file mode 120000
index 8f92a94e7..000000000
--- a/config/desktop/impish/environments/xmonad
+++ /dev/null
@@ -1 +0,0 @@
-../../focal/environments/xmonad
\ No newline at end of file
diff --git a/config/distributions/bionic/name b/config/distributions/bionic/name
deleted file mode 100644
index 6e4b58986..000000000
--- a/config/distributions/bionic/name
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu Bionic 18.04 LTS
diff --git a/config/distributions/bionic/support b/config/distributions/bionic/support
deleted file mode 100644
index 03cd47015..000000000
--- a/config/distributions/bionic/support
+++ /dev/null
@@ -1 +0,0 @@
-csc
diff --git a/config/distributions/hirsute/name b/config/distributions/hirsute/name
deleted file mode 100644
index 16f6ce4f1..000000000
--- a/config/distributions/hirsute/name
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu Hirsute 21.04
diff --git a/config/distributions/hirsute/support b/config/distributions/hirsute/support
deleted file mode 100644
index a23e5fb94..000000000
--- a/config/distributions/hirsute/support
+++ /dev/null
@@ -1 +0,0 @@
-supported
diff --git a/config/distributions/impish/name b/config/distributions/impish/name
deleted file mode 100644
index 893d22a73..000000000
--- a/config/distributions/impish/name
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu Impish 21.10
diff --git a/config/distributions/impish/support b/config/distributions/impish/support
deleted file mode 100644
index 03cd47015..000000000
--- a/config/distributions/impish/support
+++ /dev/null
@@ -1 +0,0 @@
-csc
diff --git a/config/distributions/jammy/support b/config/distributions/jammy/support
index 03cd47015..a23e5fb94 100644
--- a/config/distributions/jammy/support
+++ b/config/distributions/jammy/support
@@ -1 +1 @@
-csc
+supported
diff --git a/config/distributions/stretch/name b/config/distributions/stretch/name
deleted file mode 100644
index b095b99be..000000000
--- a/config/distributions/stretch/name
+++ /dev/null
@@ -1 +0,0 @@
-Debian 9 Stretch
diff --git a/config/distributions/stretch/support b/config/distributions/stretch/support
deleted file mode 100644
index bc2264ca1..000000000
--- a/config/distributions/stretch/support
+++ /dev/null
@@ -1 +0,0 @@
-eos
diff --git a/config/distributions/xenial/name b/config/distributions/xenial/name
deleted file mode 100644
index 5775788f6..000000000
--- a/config/distributions/xenial/name
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu Xenial 16.04 LTS
diff --git a/config/distributions/xenial/support b/config/distributions/xenial/support
deleted file mode 100644
index bc2264ca1..000000000
--- a/config/distributions/xenial/support
+++ /dev/null
@@ -1 +0,0 @@
-eos
diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh
index 8b1f63c04..511196e45 100644
--- a/lib/chroot-buildpackages.sh
+++ b/lib/chroot-buildpackages.sh
@@ -32,18 +32,12 @@ create_chroot()
 	qemu_binary['arm64']='qemu-aarch64-static'
 	apt_mirror['buster']="$DEBIAN_MIRROR"
 	apt_mirror['bullseye']="$DEBIAN_MIRROR"
-	apt_mirror['bionic']="$UBUNTU_MIRROR"
 	apt_mirror['focal']="$UBUNTU_MIRROR"
-	apt_mirror['hirsute']="$UBUNTU_MIRROR"
-	apt_mirror['impish']="$UBUNTU_MIRROR"
 	apt_mirror['jammy']="$UBUNTU_MIRROR"
 	components['buster']='main,contrib'
 	components['bullseye']='main,contrib'
 	components['sid']='main,contrib'
-	components['bionic']='main,universe,multiverse'
 	components['focal']='main,universe,multiverse'
-	components['hirsute']='main,universe,multiverse'
-	components['impish']='main,universe,multiverse'
 	components['jammy']='main,universe,multiverse'
 	display_alert "Creating build chroot" "$release/$arch" "info"
 	local includes="ccache,locales,git,ca-certificates,devscripts,libfile-fcntllock-perl,debhelper,rsync,python3,distcc,apt-utils"
diff --git a/lib/configuration.sh b/lib/configuration.sh
index 217cbf59e..e9f05f681 100644
--- a/lib/configuration.sh
+++ b/lib/configuration.sh
@@ -406,12 +406,6 @@ SDCARD="${SRC}/.tmp/rootfs-${MOUNT_UUID}"
 MOUNT="${SRC}/.tmp/mount-${MOUNT_UUID}"
 DESTIMG="${SRC}/.tmp/image-${MOUNT_UUID}"
 
-# dropbear needs to be configured differently
-[[ $CRYPTROOT_ENABLE == yes && $RELEASE == xenial ]] && exit_with_error "Encrypted rootfs is not supported in Xenial"
-[[ $RELEASE == stretch && $CAN_BUILD_STRETCH != yes ]] && exit_with_error "Building Debian Stretch images with selected kernel is not supported"
-[[ $RELEASE == bionic && $CAN_BUILD_STRETCH != yes ]] && exit_with_error "Building Ubuntu Bionic images with selected kernel is not supported"
-[[ $RELEASE == hirsute && $HOSTRELEASE == focal ]] && exit_with_error "Building Ubuntu Hirsute images requires Hirsute build host. Please upgrade your host or select a different target OS"
-
 [[ -n $ATFSOURCE && -z $ATF_USE_GCC ]] && exit_with_error "Error in configuration: ATF_USE_GCC is unset"
 [[ -z $UBOOT_USE_GCC ]] && exit_with_error "Error in configuration: UBOOT_USE_GCC is unset"
 [[ -z $KERNEL_USE_GCC ]] && exit_with_error "Error in configuration: KERNEL_USE_GCC is unset"
@@ -423,7 +417,7 @@ BOOTCONFIG_VAR_NAME=BOOTCONFIG_${BRANCH^^}
 [[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
 [[ -z $KERNELPATCHDIR ]] && KERNELPATCHDIR="$LINUXFAMILY-$BRANCH"
 
-if [[ "$RELEASE" =~ ^(xenial|bionic|focal|hirsute|impish|jammy)$ ]]; then
+if [[ "$RELEASE" =~ ^(focal|jammy)$ ]]; then
 		DISTRIBUTION="Ubuntu"
 	else
 		DISTRIBUTION="Debian"
diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh
index 1fae8af88..7eec22824 100644
--- a/lib/debootstrap.sh
+++ b/lib/debootstrap.sh
@@ -440,10 +440,8 @@ prepare_partitions()
 	# add -N number of inodes to keep mount from running out
 	# create bigger number for desktop builds
 	if [[ $BUILD_DESKTOP == yes ]]; then local node_number=4096; else local node_number=1024; fi
-	if [[ $HOSTRELEASE =~ bionic|buster|bullseye|cosmic|focal|hirsute|impish|jammy|sid ]]; then
+	if [[ $HOSTRELEASE =~ buster|bullseye|focal|jammy|sid ]]; then
 		mkopts[ext4]="-q -m 2 -O ^64bit,^metadata_csum -N $((128*${node_number}))"
-	elif [[ $HOSTRELEASE == xenial ]]; then
-		mkopts[ext4]="-q -m 2 -N $((128*${node_number}))"
 	fi
 	mkopts[fat]='-n BOOT'
 	mkopts[ext2]='-q'
diff --git a/lib/distributions.sh b/lib/distributions.sh
index 3ec270dd9..63ae159bb 100644
--- a/lib/distributions.sh
+++ b/lib/distributions.sh
@@ -620,20 +620,7 @@ install_distribution_specific()
 
 	case $RELEASE in
 
-	xenial)
-
-			# remove legal info from Ubuntu
-			[[ -f "${SDCARD}"/etc/legal ]] && rm "${SDCARD}"/etc/legal
-
-			# ureadahead needs kernel tracing options that AFAIK are present only in mainline. disable
-			chroot "${SDCARD}" /bin/bash -c \
-			"systemctl --no-reload mask ondemand.service ureadahead.service >/dev/null 2>&1"
-			chroot "${SDCARD}" /bin/bash -c \
-			"systemctl --no-reload mask setserial.service etc-setserial.service >/dev/null 2>&1"
-
-		;;
-
-	stretch|buster|sid)
+	buster|sid)
 
 			# remove doubled uname from motd
 			[[ -f "${SDCARD}"/etc/update-motd.d/10-uname ]] && rm "${SDCARD}"/etc/update-motd.d/10-uname
@@ -654,7 +641,8 @@ install_distribution_specific()
 
 
 		;;
-	bionic|focal|hirsute|impish|jammy)
+
+	focal|jammy)
 
 			# 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
diff --git a/lib/general.sh b/lib/general.sh
index 75529d4d3..64389df77 100644
--- a/lib/general.sh
+++ b/lib/general.sh
@@ -159,7 +159,7 @@ get_package_list_hash()
 
 # create_sources_list <release> <basedir>
 #
-# <release>: buster|bullseye|bionic|focal|hirsute|impish|jammy|sid
+# <release>: bullseye|focal|jammy|sid
 # <basedir>: path to root directory
 #
 create_sources_list()
@@ -169,7 +169,7 @@ create_sources_list()
 	[[ -z $basedir ]] && exit_with_error "No basedir passed to create_sources_list"
 
 	case $release in
-	stretch|buster)
+	buster)
 	cat <<-EOF > "${basedir}"/etc/apt/sources.list
 	deb http://${DEBIAN_MIRROR} $release main contrib non-free
 	#deb-src http://${DEBIAN_MIRROR} $release main contrib non-free
@@ -208,7 +208,7 @@ create_sources_list()
 	EOF
 	;;
 
-	xenial|bionic|focal|hirsute|impish|jammy)
+	focal|jammy)
 	cat <<-EOF > "${basedir}"/etc/apt/sources.list
 	deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse
 	#deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse