diff --git a/config/cli/kinetic b/config/cli/kinetic
deleted file mode 120000
index c17ec919b..000000000
--- a/config/cli/kinetic
+++ /dev/null
@@ -1 +0,0 @@
-jammy
\ No newline at end of file
diff --git a/config/cli/lunar/main b/config/cli/lunar/main
deleted file mode 120000
index bf1efea22..000000000
--- a/config/cli/lunar/main
+++ /dev/null
@@ -1 +0,0 @@
-../common/main
\ No newline at end of file
diff --git a/config/cli/mantic b/config/cli/mantic
deleted file mode 120000
index 2c1496890..000000000
--- a/config/cli/mantic
+++ /dev/null
@@ -1 +0,0 @@
-lunar
\ No newline at end of file
diff --git a/config/cli/noble b/config/cli/noble
deleted file mode 120000
index 2c1496890..000000000
--- a/config/cli/noble
+++ /dev/null
@@ -1 +0,0 @@
-lunar
\ No newline at end of file
diff --git a/config/cli/lunar/debootstrap/components b/config/cli/noble/debootstrap/components
similarity index 100%
rename from config/cli/lunar/debootstrap/components
rename to config/cli/noble/debootstrap/components
diff --git a/config/cli/lunar/debootstrap/packages b/config/cli/noble/debootstrap/packages
similarity index 100%
rename from config/cli/lunar/debootstrap/packages
rename to config/cli/noble/debootstrap/packages
diff --git a/config/cli/noble/main/config_desktop b/config/cli/noble/main/config_desktop
new file mode 120000
index 000000000..7dbb6e1b7
--- /dev/null
+++ b/config/cli/noble/main/config_desktop
@@ -0,0 +1 @@
+../../common/main/config_desktop
\ No newline at end of file
diff --git a/config/cli/noble/main/packages b/config/cli/noble/main/packages
new file mode 120000
index 000000000..c4f91f419
--- /dev/null
+++ b/config/cli/noble/main/packages
@@ -0,0 +1 @@
+../../common/main/packages
\ No newline at end of file
diff --git a/config/cli/noble/main/packages.additional b/config/cli/noble/main/packages.additional
new file mode 100644
index 000000000..6905bfd03
--- /dev/null
+++ b/config/cli/noble/main/packages.additional
@@ -0,0 +1,60 @@
+apt-file
+apt-utils
+aptitude
+automake
+avahi-autoipd
+bash-completion
+bison
+btrfs-progs
+build-essential
+cracklib-runtime
+dkms
+evtest
+expect
+f2fs-tools
+f3
+fbset
+flex
+git
+gpiod
+gnupg2
+haveged
+hdparm
+htop
+html2text
+i2c-tools
+ifenslave
+iotop
+iperf3
+iptables
+keyboard-configuration
+libdigest-sha-perl
+libfuse2t64
+libnl-3-dev
+libnl-genl-3-dev
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+libwrap0-dev
+mc
+network-manager-openvpn
+nfs-common
+ntfs-3g
+pciutils
+plymouth
+plymouth-themes
+pv
+qrencode
+rfkill
+rng-tools
+screen
+software-properties-common
+smartmontools
+stress
+sudo
+unattended-upgrades
+unicode-data
+unzip
+vnstat
+wget
+wireless-regdb
diff --git a/config/cli/noble/main/packages.uninstall b/config/cli/noble/main/packages.uninstall
new file mode 120000
index 000000000..32bd0a044
--- /dev/null
+++ b/config/cli/noble/main/packages.uninstall
@@ -0,0 +1 @@
+../../common/main/packages.uninstall
\ No newline at end of file
diff --git a/config/cli/oracular b/config/cli/oracular
index 2c1496890..c44ffafd2 120000
--- a/config/cli/oracular
+++ b/config/cli/oracular
@@ -1 +1 @@
-lunar
\ No newline at end of file
+noble
\ No newline at end of file
diff --git a/config/cli/sid b/config/cli/sid
deleted file mode 120000
index 5b206cd04..000000000
--- a/config/cli/sid
+++ /dev/null
@@ -1 +0,0 @@
-bookworm
\ No newline at end of file
diff --git a/config/cli/sid/debootstrap/components b/config/cli/sid/debootstrap/components
new file mode 120000
index 000000000..c28ba911a
--- /dev/null
+++ b/config/cli/sid/debootstrap/components
@@ -0,0 +1 @@
+../../common/debootstrap/components.debian
\ No newline at end of file
diff --git a/config/cli/sid/debootstrap/packages b/config/cli/sid/debootstrap/packages
new file mode 120000
index 000000000..34350cd53
--- /dev/null
+++ b/config/cli/sid/debootstrap/packages
@@ -0,0 +1 @@
+../../common/debootstrap/packages
\ No newline at end of file
diff --git a/config/cli/sid/main/packages b/config/cli/sid/main/packages
new file mode 120000
index 000000000..c4f91f419
--- /dev/null
+++ b/config/cli/sid/main/packages
@@ -0,0 +1 @@
+../../common/main/packages
\ No newline at end of file
diff --git a/config/cli/sid/main/packages.additional b/config/cli/sid/main/packages.additional
new file mode 100644
index 000000000..6905bfd03
--- /dev/null
+++ b/config/cli/sid/main/packages.additional
@@ -0,0 +1,60 @@
+apt-file
+apt-utils
+aptitude
+automake
+avahi-autoipd
+bash-completion
+bison
+btrfs-progs
+build-essential
+cracklib-runtime
+dkms
+evtest
+expect
+f2fs-tools
+f3
+fbset
+flex
+git
+gpiod
+gnupg2
+haveged
+hdparm
+htop
+html2text
+i2c-tools
+ifenslave
+iotop
+iperf3
+iptables
+keyboard-configuration
+libdigest-sha-perl
+libfuse2t64
+libnl-3-dev
+libnl-genl-3-dev
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+libwrap0-dev
+mc
+network-manager-openvpn
+nfs-common
+ntfs-3g
+pciutils
+plymouth
+plymouth-themes
+pv
+qrencode
+rfkill
+rng-tools
+screen
+software-properties-common
+smartmontools
+stress
+sudo
+unattended-upgrades
+unicode-data
+unzip
+vnstat
+wget
+wireless-regdb
diff --git a/config/cli/sid/main/packages.uninstall b/config/cli/sid/main/packages.uninstall
new file mode 120000
index 000000000..32bd0a044
--- /dev/null
+++ b/config/cli/sid/main/packages.uninstall
@@ -0,0 +1 @@
+../../common/main/packages.uninstall
\ No newline at end of file
diff --git a/config/cli/trixie/main b/config/cli/trixie/main
deleted file mode 120000
index bf1efea22..000000000
--- a/config/cli/trixie/main
+++ /dev/null
@@ -1 +0,0 @@
-../common/main
\ No newline at end of file
diff --git a/config/cli/trixie/main/packages b/config/cli/trixie/main/packages
new file mode 120000
index 000000000..c4f91f419
--- /dev/null
+++ b/config/cli/trixie/main/packages
@@ -0,0 +1 @@
+../../common/main/packages
\ No newline at end of file
diff --git a/config/cli/trixie/main/packages.additional b/config/cli/trixie/main/packages.additional
new file mode 100644
index 000000000..6905bfd03
--- /dev/null
+++ b/config/cli/trixie/main/packages.additional
@@ -0,0 +1,60 @@
+apt-file
+apt-utils
+aptitude
+automake
+avahi-autoipd
+bash-completion
+bison
+btrfs-progs
+build-essential
+cracklib-runtime
+dkms
+evtest
+expect
+f2fs-tools
+f3
+fbset
+flex
+git
+gpiod
+gnupg2
+haveged
+hdparm
+htop
+html2text
+i2c-tools
+ifenslave
+iotop
+iperf3
+iptables
+keyboard-configuration
+libdigest-sha-perl
+libfuse2t64
+libnl-3-dev
+libnl-genl-3-dev
+libnss-myhostname
+libpam-systemd
+libproc-processtable-perl
+libwrap0-dev
+mc
+network-manager-openvpn
+nfs-common
+ntfs-3g
+pciutils
+plymouth
+plymouth-themes
+pv
+qrencode
+rfkill
+rng-tools
+screen
+software-properties-common
+smartmontools
+stress
+sudo
+unattended-upgrades
+unicode-data
+unzip
+vnstat
+wget
+wireless-regdb
diff --git a/config/cli/trixie/main/packages.uninstall b/config/cli/trixie/main/packages.uninstall
new file mode 120000
index 000000000..32bd0a044
--- /dev/null
+++ b/config/cli/trixie/main/packages.uninstall
@@ -0,0 +1 @@
+../../common/main/packages.uninstall
\ No newline at end of file
diff --git a/config/distributions/kinetic/architectures b/config/distributions/kinetic/architectures
deleted file mode 100644
index 6103381d1..000000000
--- a/config/distributions/kinetic/architectures
+++ /dev/null
@@ -1 +0,0 @@
-arm64,armhf,riscv64,amd64
diff --git a/config/distributions/kinetic/name b/config/distributions/kinetic/name
deleted file mode 100644
index 34e90fda4..000000000
--- a/config/distributions/kinetic/name
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu kinetic 22.10
diff --git a/config/distributions/kinetic/support b/config/distributions/kinetic/support
deleted file mode 100644
index bc2264ca1..000000000
--- a/config/distributions/kinetic/support
+++ /dev/null
@@ -1 +0,0 @@
-eos
diff --git a/config/distributions/lunar/architectures b/config/distributions/lunar/architectures
deleted file mode 100644
index 6103381d1..000000000
--- a/config/distributions/lunar/architectures
+++ /dev/null
@@ -1 +0,0 @@
-arm64,armhf,riscv64,amd64
diff --git a/config/distributions/lunar/name b/config/distributions/lunar/name
deleted file mode 100644
index 92fcbb2ae..000000000
--- a/config/distributions/lunar/name
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu lunar 23.04
diff --git a/config/distributions/lunar/support b/config/distributions/lunar/support
deleted file mode 100644
index bc2264ca1..000000000
--- a/config/distributions/lunar/support
+++ /dev/null
@@ -1 +0,0 @@
-eos
diff --git a/config/distributions/mantic/architectures b/config/distributions/mantic/architectures
deleted file mode 100644
index 6103381d1..000000000
--- a/config/distributions/mantic/architectures
+++ /dev/null
@@ -1 +0,0 @@
-arm64,armhf,riscv64,amd64
diff --git a/config/distributions/mantic/name b/config/distributions/mantic/name
deleted file mode 100644
index 9a71a79d7..000000000
--- a/config/distributions/mantic/name
+++ /dev/null
@@ -1 +0,0 @@
-Ubuntu Mantic 23.10
diff --git a/config/distributions/mantic/support b/config/distributions/mantic/support
deleted file mode 100644
index bc2264ca1..000000000
--- a/config/distributions/mantic/support
+++ /dev/null
@@ -1 +0,0 @@
-eos
diff --git a/config/distributions/noble/architectures b/config/distributions/noble/architectures
index 92b85d07d..15f10638d 100644
--- a/config/distributions/noble/architectures
+++ b/config/distributions/noble/architectures
@@ -1 +1 @@
-arm64,riscv64,amd64
+armhf,arm64,riscv64,amd64
diff --git a/config/distributions/oracular/architectures b/config/distributions/oracular/architectures
index 92b85d07d..15f10638d 100644
--- a/config/distributions/oracular/architectures
+++ b/config/distributions/oracular/architectures
@@ -1 +1 @@
-arm64,riscv64,amd64
+armhf,arm64,riscv64,amd64
diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh
index 2221440e7..8569635fa 100644
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -307,7 +307,7 @@ function do_extra_configuration() {
 	[[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-$LINUXFAMILY" # @TODO move to hook
 	[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"
 
-	if [[ "$RELEASE" =~ ^(focal|jammy|kinetic|lunar|mantic|noble|oracular)$ ]]; then
+	if [[ "$RELEASE" =~ ^(focal|jammy|noble|oracular)$ ]]; then
 		DISTRIBUTION="Ubuntu"
 	else
 		DISTRIBUTION="Debian"
diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh
index 5886196a5..7d23a8b02 100644
--- a/lib/functions/rootfs/distro-specific.sh
+++ b/lib/functions/rootfs/distro-specific.sh
@@ -88,7 +88,7 @@ function install_distribution_specific() {
 # create_sources_list_and_deploy_repo_key <when> <release> <basedir>
 #
 # <when>: rootfs|image
-# <release>: bullseye|bookworm|sid|focal|jammy|kinetic|lunar|mantic
+# <release>: bullseye|bookworm|sid|focal|jammy|noble|oracular
 # <basedir>: path to root directory
 #
 function create_sources_list_and_deploy_repo_key() {
@@ -163,7 +163,7 @@ function create_sources_list_and_deploy_repo_key() {
 			fi
 			;;
 
-		focal | jammy | kinetic | lunar | mantic | noble | oracular)
+		focal | jammy | noble | oracular)
 			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