diff --git a/roles/mail_forwarder/molecule/default/molecule.yml b/roles/mail_forwarder/molecule/default/molecule.yml
index 0ce66b2c05205716628d04b4a45b6464a03acb55..03e15534c17c6e723ac0e3654cb8c2e1100c6ca2 100644
--- a/roles/mail_forwarder/molecule/default/molecule.yml
+++ b/roles/mail_forwarder/molecule/default/molecule.yml
@@ -23,7 +23,7 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 192.168.56.10
+        ip: 192.168.56.11
         network_name: private_network
         type: static
 
@@ -36,11 +36,11 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 192.168.56.11
+        ip: 192.168.56.12
         network_name: private_network
         type: static
 
-  - name: parameters-mandatory-buster64
+  - name: parameters-mandatory-buster
     groups:
       - parameters-mandatory
     box: debian/contrib-buster64
@@ -48,11 +48,11 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 192.168.56.20
+        ip: 192.168.56.21
         network_name: private_network
         type: static
 
-  - name: parameters-optional-buster64
+  - name: parameters-optional-buster
     groups:
       - parameters-optional
     box: debian/contrib-buster64
@@ -60,11 +60,11 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 192.168.56.21
+        ip: 192.168.56.22
         network_name: private_network
         type: static
 
-  - name: parameters-no-incoming-buster64
+  - name: parameters-no-incoming-buster
     groups:
       - parameters-no-incoming
     box: debian/contrib-buster64
@@ -72,7 +72,7 @@ platforms:
     cpus: 1
     interfaces:
       - auto_config: true
-        ip: 192.168.56.22
+        ip: 192.168.56.23
         network_name: private_network
         type: static
 
diff --git a/roles/mail_forwarder/molecule/default/prepare.yml b/roles/mail_forwarder/molecule/default/prepare.yml
index dc46f86be576f9244deaa9ddc4c74ce9f5c98921..4ec921e92400f6b847f8b689bc5f48817d7f9cee 100644
--- a/roles/mail_forwarder/molecule/default/prepare.yml
+++ b/roles/mail_forwarder/molecule/default/prepare.yml
@@ -64,11 +64,11 @@
         mode: 0644
         state: present
       with_dict:
-        192.168.56.10: "mail-server domain1"
-        192.168.56.11: "client1"
-        192.168.56.20: "parameters-mandatory-buster64"
-        192.168.56.21: "parameters-optional-buster64"
-        192.168.56.22: "parameters-no-incoming-buster64"
+        192.168.56.11: "mail-server domain1"
+        192.168.56.12: "client1"
+        192.168.56.21: "parameters-mandatory-buster"
+        192.168.56.22: "parameters-optional-buster"
+        192.168.56.23: "parameters-no-incoming-buster"
 
     - name: Install tools for testing
       apt: