diff --git a/roles/xmpp_server/molecule/default/molecule.yml b/roles/xmpp_server/molecule/default/molecule.yml
index 166e683420d8f7b7f08a4ca521ca2c2d10ccf5d3..a92a818d2eb2769293e174814c5a77dd2ebbbf0f 100644
--- a/roles/xmpp_server/molecule/default/molecule.yml
+++ b/roles/xmpp_server/molecule/default/molecule.yml
@@ -15,51 +15,12 @@ lint:
 platforms:
 
   - name: ldap-server
-    box: debian/contrib-stretch64
-    memory: 512
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.10
-        network_name: private_network
-        type: static
-
-  - name: client-stretch
-    groups:
-      - clients
-      - stretch
-    box: debian/contrib-stretch64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.21
-        network_name: private_network
-        type: static
-
-  - name: parameters-mandatory-stretch64
-    groups:
-      - parameters-mandatory
-      - stretch
-    box: debian/contrib-stretch64
-    memory: 512
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.32
-        network_name: private_network
-        type: static
-
-  - name: parameters-optional-stretch64
-    groups:
-      - parameters-optional
-      - stretch
-    box: debian/contrib-stretch64
+    box: debian/contrib-buster64
     memory: 512
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.33
+        ip: 192.168.56.10
         network_name: private_network
         type: static
 
@@ -72,7 +33,7 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.20
+        ip: 192.168.56.20
         network_name: private_network
         type: static
 
@@ -85,7 +46,7 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.30
+        ip: 192.168.56.30
         network_name: private_network
         type: static
 
@@ -98,7 +59,7 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 10.31.127.31
+        ip: 192.168.56.31
         network_name: private_network
         type: static