diff --git a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml
index 9acb1cc465386403e88a8d249c8244ed13c860ea..e12030b01e8a9a88cccf3b855085bbb4aa36871d 100644
--- a/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml
+++ b/roles/xmpp_server/molecule/default/host_vars/ldap-server.yml
@@ -40,5 +40,5 @@ backup_host_ssh_private_keys:
   ecdsa: "{{ lookup('file', 'tests/data/ssh/server_ecdsa') }}"
 backup_clients:
   - server: parameters-optional-bullseye
-    ip: 192.168.56.42
+    ip: 192.168.56.52
     public_key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}"
diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml
index f9c34f3894953a44d9a31722fc798f807ac71a22..6c33bd67c05b3a9356977fa83dcac98a0f886b9a 100644
--- a/roles/xmpp_server/molecule/default/molecule.yml
+++ b/roles/xmpp_server/molecule/default/molecule.yml
@@ -14,6 +14,10 @@ lint:
 
 platforms:
 
+
+  # Helpers
+  # =======
+
   - name: ldap-server
     box: debian/bullseye64
     memory: 512
@@ -26,6 +30,10 @@ platforms:
         network_name: private_network
         type: static
 
+
+  # Debian 11 Bullseye
+  # ================
+
   - name: client-bullseye
     groups:
       - clients
@@ -37,7 +45,7 @@ platforms:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
     interfaces:
       - auto_config: true
-        ip: 192.168.56.22
+        ip: 192.168.56.41
         network_name: private_network
         type: static
 
@@ -52,7 +60,7 @@ platforms:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
     interfaces:
       - auto_config: true
-        ip: 192.168.56.41
+        ip: 192.168.56.51
         network_name: private_network
         type: static
 
@@ -67,7 +75,7 @@ platforms:
       - "customize ['modifyvm', :id, '--paravirtprovider', 'minimal']"
     interfaces:
       - auto_config: true
-        ip: 192.168.56.42
+        ip: 192.168.56.52
         network_name: private_network
         type: static
 
diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index 987ef040ee77548c25998785c13e48eb0ba53218..fbe74a73026197074a34eb4eeb31cc6e80930d40 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -101,9 +101,9 @@
         state: present
       with_dict:
         192.168.56.11: "ldap-server backup-server"
-        192.168.56.22: "client-bullseye"
-        192.168.56.41: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
-        192.168.56.42: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3"
+        192.168.56.41: "client-bullseye"
+        192.168.56.51: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
+        192.168.56.52: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3"
 
 - hosts: clients
   become: true