diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml
index 101c39707f8b05792e53b2d4851181233f95e610..27c3b3d285922d19a6237bed9b8add0436b65e5a 100644
--- a/roles/xmpp_server/molecule/default/molecule.yml
+++ b/roles/xmpp_server/molecule/default/molecule.yml
@@ -15,7 +15,7 @@ lint:
 platforms:
 
   - name: ldap-server
-    box: debian/contrib-buster64
+    box: debian/bullseye64
     memory: 512
     cpus: 1
     interfaces:
@@ -37,7 +37,20 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: parameters-mandatory-buster64
+  - name: client-bullseye
+    groups:
+      - clients
+      - bullseye
+    box: debian/bullseye64
+    memory: 256
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.22
+        network_name: private_network
+        type: static
+
+  - name: parameters-mandatory-buster
     groups:
       - parameters-mandatory
       - buster
@@ -50,7 +63,7 @@ platforms:
         network_name: private_network
         type: static
 
-  - name: parameters-optional-buster64
+  - name: parameters-optional-buster
     groups:
       - parameters-optional
       - buster
@@ -63,6 +76,32 @@ platforms:
         network_name: private_network
         type: static
 
+  - name: parameters-mandatory-bullseye
+    groups:
+      - parameters-mandatory
+      - bullseye
+    box: debian/bullseye64
+    memory: 512
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.41
+        network_name: private_network
+        type: static
+
+  - name: parameters-optional-bullseye
+    groups:
+      - parameters-optional
+      - bullseye
+    box: debian/bullseye64
+    memory: 512
+    cpus: 1
+    interfaces:
+      - auto_config: true
+        ip: 192.168.56.42
+        network_name: private_network
+        type: static
+
 provisioner:
   name: ansible
   playbooks: