diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml
index 93303a1c894c75abdf229df8e4b3b94c7e02d6ba..ba20de4155ccf89dfe2968713614d3cbabda07a2 100644
--- a/roles/mail_server/molecule/default/prepare.yml
+++ b/roles/mail_server/molecule/default/prepare.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Set-up fixtures
+- name: Prepare, test fixtures
   hosts: localhost
   connection: local
   gather_facts: false
@@ -46,17 +46,13 @@
 
 - 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
@@ -69,7 +65,7 @@
           - nmap
         state: present
 
-- name: Set-up a local ClamAV database mirror to avoid hitting upstream rate limits
+- name: Prepare, helpers, local ClamAV database mirror (avoid upstream rate limits)
   hosts: clamav-database
   become: true
   tasks:
@@ -173,7 +169,8 @@
         name: nginx
         state: restarted
 
-- hosts: bookworm
+- name: Prepare, test fixtures
+  hosts: bookworm
   become: true
   tasks:
 
@@ -213,7 +210,8 @@
         192.168.56.31: "parameters-mandatory parameters-mandatory-bookworm"
         192.168.56.32: "parameters-optional parameters-optional-bookworm"
 
-- hosts: client
+- name: Prepare, helpers
+  hosts: client
   become: true
   tasks:
 
@@ -336,13 +334,15 @@
         name: postfix
         state: restarted
 
-- 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:
 
@@ -420,7 +420,8 @@
           - uid=john,ou=people,dc=local
           - uid=jane,ou=people,dc=local
 
-- hosts: parameters-mandatory,parameters-optional
+- name: Prepare, test fixtures
+  hosts: parameters-mandatory,parameters-optional
   become: true
   tasks: