diff --git a/bundles/apt/files/sources.list-debian-bookworm b/bundles/apt/files/sources.list-debian-bookworm
new file mode 100644
index 0000000..8c19914
--- /dev/null
+++ b/bundles/apt/files/sources.list-debian-bookworm
@@ -0,0 +1,3 @@
+deb http://deb.debian.org/debian/ bookworm main non-free contrib
+deb http://security.debian.org/debian-security bookworm-security main contrib non-free
+deb http://deb.debian.org/debian/ bookworm-updates main contrib non-free
diff --git a/bundles/apt/items.py b/bundles/apt/items.py
index 639417d..5dd236d 100644
--- a/bundles/apt/items.py
+++ b/bundles/apt/items.py
@@ -4,6 +4,7 @@ supported_os = {
     'debian': {
         10: 'buster',
         11: 'bullseye',
+        12: 'bookworm',
         99: 'unstable',
     },
     'raspbian': {
@@ -113,7 +114,7 @@ pkg_apt = {
     'mtr': {},
     'ncdu': {},
     'ncurses-term': {},
-    'netcat': {},
+    'netcat-openbsd': {},
     'nmap': {},
     'python3': {},
     'python3-dev': {},
diff --git a/groups/os.py b/groups/os.py
index a1f3b72..ab6339c 100644
--- a/groups/os.py
+++ b/groups/os.py
@@ -63,10 +63,8 @@ groups['arch'] = {
 }
 
 groups['debian'] = {
-    'subgroups': {
-        'debian-buster',
-        'debian-bullseye',
-        'debian-sid',
+    'subgroup_patterns': {
+        '^debian-[a-z]+$',
     },
     'bundles': {
         'apt',
@@ -84,6 +82,10 @@ groups['debian-bullseye'] = {
     'os_version': (11,)
 }
 
+groups['debian-bookworm'] = {
+    'os_version': (12,)
+}
+
 groups['debian-sid'] = {
     'os_version': (99,)
 }