diff --git a/Makefile.builder b/Makefile.builder
index f4a4192..e153f80 100644
--- a/Makefile.builder
+++ b/Makefile.builder
@@ -1,13 +1,11 @@
-ifneq (,$(findstring $(DIST),wheezy jessie stretch buster bullseye))
+ifneq (,$(findstring $(DIST),buster bullseye bookworm))
     DEBIAN_PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
     DISTRIBUTION := debian
     BUILDER_MAKEFILE = $(DEBIAN_PLUGIN_DIR)Makefile.debian
     TEMPLATE_SCRIPTS = $(DEBIAN_PLUGIN_DIR)template_debian
-    DIST_TAG := $(strip $(subst wheezy, deb7, $(DIST)))
-    DIST_TAG := $(strip $(subst jessie, deb8, $(DIST_TAG)))
-    DIST_TAG := $(strip $(subst stretch, deb9, $(DIST_TAG)))
     DIST_TAG := $(strip $(subst buster, deb10, $(DIST_TAG)))
     DIST_TAG := $(strip $(subst bullseye, deb11, $(DIST_TAG)))
+    DIST_TAG := $(strip $(subst bookworm, deb12, $(DIST_TAG)))
 endif
 ifneq (,$(findstring $(DIST),trusty xenial bionic focal))
     DEBIAN_PLUGIN_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
diff --git a/keys/bookworm-debian-archive-keyring.gpg b/keys/bookworm-debian-archive-keyring.gpg
new file mode 120000
index 0000000..596a305
--- /dev/null
+++ b/keys/bookworm-debian-archive-keyring.gpg
@@ -0,0 +1 @@
+buster-debian-archive-keyring.gpg
\ No newline at end of file
diff --git a/template_debian/02_install_groups_bookworm.sh b/template_debian/02_install_groups_bookworm.sh
new file mode 100755
index 0000000..e79d143
--- /dev/null
+++ b/template_debian/02_install_groups_bookworm.sh
@@ -0,0 +1,19 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+if [ "$VERBOSE" -ge 2 -o "$DEBUG" == "1" ]; then
+    set -x
+fi
+
+source "${SCRIPTSDIR}/vars.sh"
+source "${SCRIPTSDIR}/distribution.sh"
+
+##### "=========================================================================
+debug " Installing custom packages and customizing ${DIST}"
+##### "=========================================================================
+
+#### '--------------------------------------------------------------------------
+info ' Adding contrib, non-free and Debian security to repository.'
+#### '--------------------------------------------------------------------------
+updateDebianSourceList
+aptUpdate
diff --git a/template_debian/appmenus_bookworm/netvm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm/netvm-whitelisted-appmenus.list
new file mode 100644
index 0000000..b6e3341
--- /dev/null
+++ b/template_debian/appmenus_bookworm/netvm-whitelisted-appmenus.list
@@ -0,0 +1 @@
+org.gnome.Terminal.desktop
diff --git a/template_debian/appmenus_bookworm/vm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm/vm-whitelisted-appmenus.list
new file mode 100644
index 0000000..af1718a
--- /dev/null
+++ b/template_debian/appmenus_bookworm/vm-whitelisted-appmenus.list
@@ -0,0 +1,5 @@
+org.gnome.Terminal.desktop
+org.gnome.Nautilus.desktop
+firefox-esr.desktop
+thunderbird.desktop
+yelp.desktop
diff --git a/template_debian/appmenus_bookworm/whitelisted-appmenus.list b/template_debian/appmenus_bookworm/whitelisted-appmenus.list
new file mode 100644
index 0000000..ecab57c
--- /dev/null
+++ b/template_debian/appmenus_bookworm/whitelisted-appmenus.list
@@ -0,0 +1,3 @@
+org.gnome.Terminal.desktop
+org.gnome.Nautilus.desktop
+firefox-esr.desktop
diff --git a/template_debian/appmenus_bookworm_gnome/netvm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm_gnome/netvm-whitelisted-appmenus.list
new file mode 100644
index 0000000..7ea7139
--- /dev/null
+++ b/template_debian/appmenus_bookworm_gnome/netvm-whitelisted-appmenus.list
@@ -0,0 +1 @@
+debian-xterm.desktop
diff --git a/template_debian/appmenus_bookworm_gnome/vm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm_gnome/vm-whitelisted-appmenus.list
new file mode 100644
index 0000000..8c77e3d
--- /dev/null
+++ b/template_debian/appmenus_bookworm_gnome/vm-whitelisted-appmenus.list
@@ -0,0 +1,16 @@
+evolution.desktop
+gimp.desktop
+yelp.desktop
+iceweasel.desktop
+eog.desktop
+rhythmbox.desktop
+gnome-system-log.desktop
+org.gnome.Terminal.desktop
+gnome-calculator.desktop
+org.gnome.Cheese.desktop
+org.gnome.Nautilus.desktop
+org.gnome.gedit.desktop
+shotwell.desktop
+org.gnome.Totem.desktop
+libreoffice-startcenter.desktop
+session-properties.desktop
diff --git a/template_debian/appmenus_bookworm_gnome/whitelisted-appmenus.list b/template_debian/appmenus_bookworm_gnome/whitelisted-appmenus.list
new file mode 100644
index 0000000..8fc27c2
--- /dev/null
+++ b/template_debian/appmenus_bookworm_gnome/whitelisted-appmenus.list
@@ -0,0 +1,6 @@
+gdebi.desktop
+gpk-application.desktop
+gnome-printers-panel.desktop
+tracker-preferences.desktop
+gnome-system-log.desktop
+org.gnome.Terminal.desktop
diff --git a/template_debian/appmenus_bookworm_minimal/netvm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm_minimal/netvm-whitelisted-appmenus.list
new file mode 100644
index 0000000..7ea7139
--- /dev/null
+++ b/template_debian/appmenus_bookworm_minimal/netvm-whitelisted-appmenus.list
@@ -0,0 +1 @@
+debian-xterm.desktop
diff --git a/template_debian/appmenus_bookworm_minimal/vm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm_minimal/vm-whitelisted-appmenus.list
new file mode 100644
index 0000000..7ea7139
--- /dev/null
+++ b/template_debian/appmenus_bookworm_minimal/vm-whitelisted-appmenus.list
@@ -0,0 +1 @@
+debian-xterm.desktop
diff --git a/template_debian/appmenus_bookworm_minimal/whitelisted-appmenus.list b/template_debian/appmenus_bookworm_minimal/whitelisted-appmenus.list
new file mode 100644
index 0000000..7ea7139
--- /dev/null
+++ b/template_debian/appmenus_bookworm_minimal/whitelisted-appmenus.list
@@ -0,0 +1 @@
+debian-xterm.desktop
diff --git a/template_debian/appmenus_bookworm_xfce/netvm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm_xfce/netvm-whitelisted-appmenus.list
new file mode 100644
index 0000000..0771e73
--- /dev/null
+++ b/template_debian/appmenus_bookworm_xfce/netvm-whitelisted-appmenus.list
@@ -0,0 +1 @@
+xfce4-terminal.desktop
diff --git a/template_debian/appmenus_bookworm_xfce/vm-whitelisted-appmenus.list b/template_debian/appmenus_bookworm_xfce/vm-whitelisted-appmenus.list
new file mode 100644
index 0000000..5b19abc
--- /dev/null
+++ b/template_debian/appmenus_bookworm_xfce/vm-whitelisted-appmenus.list
@@ -0,0 +1,4 @@
+xfce4-terminal.desktop
+Thunar.desktop
+firefox-esr.desktop
+xfce-settings-manager.desktop
diff --git a/template_debian/appmenus_bookworm_xfce/whitelisted-appmenus.list b/template_debian/appmenus_bookworm_xfce/whitelisted-appmenus.list
new file mode 100644
index 0000000..617e181
--- /dev/null
+++ b/template_debian/appmenus_bookworm_xfce/whitelisted-appmenus.list
@@ -0,0 +1,2 @@
+xfce4-terminal.desktop
+xfce-settings-manager.desktop
diff --git a/template_debian/distribution.sh b/template_debian/distribution.sh
index 649f3eb..d96ce4b 100644
--- a/template_debian/distribution.sh
+++ b/template_debian/distribution.sh
@@ -283,7 +283,7 @@ function updateDebianSourceList() {
     fi
 
     # Add Debian security repositories
-    if [ "${DEBIANVERSION}" != "bullseye" ]; then
+    if [ "${DEBIANVERSION}" == "buster" ] || [ "${DEBIANVERSION}" == "stretch" ]; then
         security_suffix="/updates"
     else
         security_suffix="-security"