diff --git a/keys/forky-debian-archive-keyring.gpg b/keys/forky-debian-archive-keyring.gpg
new file mode 100644
index 0000000..3370a11
Binary files /dev/null and b/keys/forky-debian-archive-keyring.gpg differ
diff --git a/pbuilderrc b/pbuilderrc
index 7bab8df..8d79076 100644
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -14,7 +14,7 @@ LOGLEVEL=I
 USECOLORS=auto
 
 case ${DISTRIBUTION} in
-    buster|bullseye|bookworm|trixie|sid|experimental)
+    buster|bullseye|bookworm|trixie|forky|sid|experimental)
         DIST_VENDOR=debian
         MIRRORSITE=http://deb.debian.org/debian
         ;;
@@ -58,7 +58,7 @@ BUILDRESULT="${CHROOT_DIR}/pbuilder/results"
 # components on Debian use "main contrib non-free" and on Ubuntu "main
 # restricted universe multiverse"
 case ${DISTRIBUTION} in
-    buster|bullseye|bookworm|trixie|sid|experimental)
+    buster|bullseye|bookworm|trixie|forky|sid|experimental)
         COMPONENTS="main"
         ;;
     focal|jammy|lunar)
diff --git a/template_debian/02_install_groups_forky.sh b/template_debian/02_install_groups_forky.sh
new file mode 100755
index 0000000..2bc3809
--- /dev/null
+++ b/template_debian/02_install_groups_forky.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+# vim: set ts=4 sw=4 sts=4 et :
+
+if [ "$DEBUG" == "1" ]; then
+    set -x
+fi
+
+# Source external scripts
+# shellcheck source=template_debian/vars.sh
+source "${TEMPLATE_CONTENT_DIR}/vars.sh"
+# shellcheck source=template_debian/distribution.sh
+source "${TEMPLATE_CONTENT_DIR}/distribution.sh"
+
+##### "=========================================================================
+debug " Installing custom packages and customizing ${DIST_CODENAME}"
+##### "=========================================================================
+
+#### '--------------------------------------------------------------------------
+info ' Adding contrib, non-free and Debian security to repository.'
+#### '--------------------------------------------------------------------------
+updateDebianSourceList
+aptUpdate
diff --git a/template_debian/distribution.sh b/template_debian/distribution.sh
index 19cc578..474faf3 100644
--- a/template_debian/distribution.sh
+++ b/template_debian/distribution.sh
@@ -300,10 +300,9 @@ function updateDebianSourceList() {
     touch "${list}"
 
     nonfree=non-free
-    if [ "${DIST_CODENAME}" = "bookworm" ] || [ "${DIST_CODENAME}" = "trixie" ]; then
+    if [ "${DIST_CODENAME}" = "bookworm" ] || [ "${DIST_CODENAME}" = "trixie" ]  || [ "${DIST_CODENAME}" = "forky" ]; then
         nonfree=non-free-firmware
     fi
-
     # Add contrib and non-free component to repository
     sed -i "s/${DIST_CODENAME} main$/${DEBIANVERSION} main contrib $nonfree/g" "${list}"
 
diff --git a/template_debian/packages_forky.list b/template_debian/packages_forky.list
new file mode 100644
index 0000000..0d50a9c
--- /dev/null
+++ b/template_debian/packages_forky.list
@@ -0,0 +1,22 @@
+alsa-utils
+apt-transport-https
+cryptsetup
+cups
+exfat-fuse
+firefox-esr
+firmware-linux
+git
+haveged
+libnotify-bin
+locales
+locales-all
+lvm2
+ncurses-term
+network-manager
+nftables
+thunderbird
+vim-nox
+xdg-user-dirs
+xsettingsd
+gnupg
+systemd-timesyncd
diff --git a/template_debian/packages_forky_minimal.list b/template_debian/packages_forky_minimal.list
new file mode 100644
index 0000000..49831a6
--- /dev/null
+++ b/template_debian/packages_forky_minimal.list
@@ -0,0 +1,3 @@
+xterm
+libfile-mimeinfo-perl
+gnupg