diff --git a/roles/mail_server/molecule/default/molecule.yml b/roles/mail_server/molecule/default/molecule.yml
index e0645d4a568b0cbd6838f67648a84a72461030c1..0cf54af4c396f00127374d8472c7c6120fba31c2 100644
--- a/roles/mail_server/molecule/default/molecule.yml
+++ b/roles/mail_server/molecule/default/molecule.yml
@@ -24,7 +24,7 @@ platforms:
   # =======
 
   - name: clamav-database
-    box: debian/bullseye64
+    box: debian/bookworm64
     memory: 512
     cpus: 1
     provider_raw_config_args:
@@ -38,7 +38,7 @@ platforms:
       synced_folder: true
 
   - name: ldap-server
-    box: debian/bullseye64
+    box: debian/bookworm64
     memory: 256
     cpus: 1
     provider_raw_config_args:
@@ -118,6 +118,74 @@ platforms:
         type: static
 
 
+  # Debian 11 Bookworm
+  # ==================
+
+  - name: client1-bookworm
+    groups:
+      - client
+      - client-relay-allowed
+      - bookworm
+      - smtp-server-requiring-tls
+    box: debian/bookworm64
+    memory: 256
+    cpus: 1
+    provider_raw_config_args:
+      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.21
+        network_name: private_network
+        type: static
+
+  - name: client2-bookworm
+    groups:
+      - client
+      - client-relay-forbidden
+      - bookworm
+      - smtp-server-refusing-tls
+    box: debian/bookworm64
+    memory: 256
+    cpus: 1
+    provider_raw_config_args:
+      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.22
+        network_name: private_network
+        type: static
+
+  - name: parameters-mandatory-bookworm
+    groups:
+      - parameters-mandatory
+      - bookworm
+    box: debian/bookworm64
+    memory: 2048
+    cpus: 1
+    provider_raw_config_args:
+      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.31
+        network_name: private_network
+        type: static
+
+  - name: parameters-optional-bookworm
+    groups:
+      - parameters-optional
+      - bookworm
+    box: debian/bookworm64
+    memory: 2048
+    cpus: 1
+    provider_raw_config_args:
+      - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.32
+        network_name: private_network
+        type: static
+
+
 provisioner:
   name: ansible
   playbooks: