diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml
index ca521eaf18d2eeb2c96df3b6dac7ec89155d7c57..51f28bdf518207435a35dc6c5655b3a2b7f748fc 100644
--- a/roles/mail_server/molecule/default/prepare.yml
+++ b/roles/mail_server/molecule/default/prepare.yml
@@ -29,15 +29,6 @@
         - name: ldap-server_ldap
           fqdn: ldap-server
 
-        - name: parameters-mandatory-buster_imap
-          fqdn: parameters-mandatory-buster
-        - name: parameters-mandatory-buster_smtp
-          fqdn: parameters-mandatory-buster
-        - name: parameters-optional-buster_imap
-          fqdn: parameters-optional-buster
-        - name: parameters-optional-buster_smtp
-          fqdn: parameters-optional-buster
-
         - name: parameters-mandatory-bullseye_imap
           fqdn: parameters-mandatory-bullseye
         - name: parameters-mandatory-bullseye_smtp
@@ -182,28 +173,6 @@
         name: nginx
         state: restarted
 
-- hosts: buster
-  become: true
-  tasks:
-
-    - name: Set-up the hosts file
-      lineinfile:
-        path: /etc/hosts
-        regexp: "^{{ item.key }}"
-        line: "{{ item.key }} {{ item.value }}"
-        owner: root
-        group: root
-        mode: 0644
-        state: present
-      with_dict:
-        # Force mail servers to use local ClamAV database mirror.
-        192.168.56.11: "db.local.clamav.net database.clamav.net"
-        192.168.56.12: "ldap-server backup-server"
-        192.168.56.21: "client1 smtp-server-requiring-tls"
-        192.168.56.22: "client2 smtp-server-refusing-tls"
-        192.168.56.31: "parameters-mandatory parameters-mandatory-buster"
-        192.168.56.32: "parameters-optional parameters-optional-buster"
-
 - hosts: bullseye
   become: true
   tasks: