diff --git a/roles/web_server/molecule/default/prepare.yml b/roles/web_server/molecule/default/prepare.yml
index f8a0537cb0faf9575ee831015a9bbda42e5e42e0..06a9a42ee679932cba5cc5b04044988b41246474 100644
--- a/roles/web_server/molecule/default/prepare.yml
+++ b/roles/web_server/molecule/default/prepare.yml
@@ -23,10 +23,10 @@
           - "{{ item.name }}"
           - "{{ item.fqdn }}"
       with_items:
-        - name: parameters-mandatory-buster64_https
-          fqdn: parameters-mandatory
-        - name: parameters-optional-buster64_https
-          fqdn: parameters-optional
+        - name: parameters-mandatory-buster_https
+          fqdn: parameters-mandatory-buster
+        - name: parameters-optional-buster_https
+          fqdn: parameters-optional-buster
 
     - name: Set-up link to generated X.509 material
       file:
@@ -59,7 +59,7 @@
           - nmap
         state: present
 
-- hosts: buster
+- hosts: all
   become: true
   tasks:
 
@@ -73,9 +73,9 @@
         mode: 0644
         state: present
       with_dict:
-        192.168.56.20: "client1"
-        192.168.56.30: "parameters-mandatory"
-        192.168.56.31: "parameters-optional"
+        192.168.56.11: "client"
+        192.168.56.21: "parameters-mandatory-buster"
+        192.168.56.22: "parameters-optional-buster"
 
     - name: Install curl for testing redirects and webpage content
       apt: