diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index 1111e787c5fe75f0d7b8106cfc3cc64de42e3989..9a18e4048d553a8d0dc0cd80983793ef418faf6a 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Set-up fixtures
+- name: Prepare, test fixtures
   hosts: localhost
   connection: local
   gather_facts: false
@@ -47,17 +47,15 @@
 
 - name: Prepare
   hosts: all
+  become: true
   gather_facts: false
   tasks:
+
     - name: Install python for Ansible
       raw: test -e /usr/bin/python3 || (apt -y update && apt install -y python3-minimal)
       become: true
       changed_when: false
 
-- hosts: all
-  become: true
-  tasks:
-
     - name: Update all caches to avoid errors due to missing remote archives
       apt:
         update_cache: true
@@ -76,7 +74,8 @@
         regexp: "host\\.name\\)"
         replace: "host.targetname)"
 
-- hosts: bookworm
+- name: Prepare, test fixtures
+  hosts: bookworm
   become: true
   tasks:
 
@@ -113,7 +112,8 @@
         192.168.56.31: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
         192.168.56.32: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3"
 
-- hosts: clients
+- name: Prepare, helpers
+  hosts: clients
   become: true
   tasks:
 
@@ -187,13 +187,15 @@
     - name: Update CA certificate cache
       command: /usr/sbin/update-ca-certificates --fresh
 
-- hosts: ldap-server
+- name: Prepare, helpers
+  hosts: ldap-server
   become: true
   roles:
     - ldap_server
     - backup_server
 
-- hosts: ldap-server
+- name: Prepare, test fixtures
+  hosts: ldap-server
   become: true
   tasks:
 
@@ -258,7 +260,8 @@
           - uid=mick,ou=people,dc=local
           - uid=eve,ou=people,dc=local
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Prepare, test fixtures
+  hosts: parameters-mandatory,parameters-optional
   become: true
   tasks: