diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index 6d4e6d58b234b6eabd522d16d02a99106ff4ac24..07ddb70c3d7a1740b2bc6da05157d14f092740c6 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -22,13 +22,30 @@
         - name: ldap-server_ldap
           fqdn:
             - ldap-server
-        - name: parameters-mandatory-buster64_xmpp
+
+        - name: parameters-mandatory-buster_xmpp
           fqdn:
             - parameters-mandatory
             - domain1
             - proxy.domain1
             - conference.domain1
-        - name: parameters-optional-buster64_xmpp
+        - name: parameters-optional-buster_xmpp
+          fqdn:
+            - parameters-optional
+            - domain2
+            - proxy.domain2
+            - conference.domain2
+            - domain3
+            - proxy.domain3
+            - conference.domain3
+
+        - name: parameters-mandatory-bullseye_xmpp
+          fqdn:
+            - parameters-mandatory
+            - domain1
+            - proxy.domain1
+            - conference.domain1
+        - name: parameters-optional-bullseye_xmpp
           fqdn:
             - parameters-optional
             - domain2
@@ -75,6 +92,16 @@
         regexp: "host\\.name\\)"
         replace: "host.targetname)"
 
+    - name: Enable TLSv1.0+ in global OpenSSL configuration file in order to be able to test the xmpp_server_tls_protocol parameter
+      lineinfile:
+        path: "/etc/ssl/openssl.cnf"
+        regexp: "^MinProtocol ="
+        line: "MinProtocol = TLSv1.0"
+        owner: root
+        group: root
+        mode: 0644
+        state: present
+
 - hosts: buster
   become: true
   tasks:
@@ -94,15 +121,24 @@
         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"
 
-    - name: Enable TLSv1.0+ in global OpenSSL configuration file in order to be able to test the xmpp_server_tls_protocol parameter
+- hosts: bullseye
+  become: true
+  tasks:
+
+    - name: Set-up the hosts file
       lineinfile:
-        path: "/etc/ssl/openssl.cnf"
-        regexp: "^MinProtocol ="
-        line: "MinProtocol = TLSv1.0"
+        path: /etc/hosts
+        regexp: "^{{ item.key }}"
+        line: "{{ item.key }} {{ item.value }}"
         owner: root
         group: root
         mode: 0644
         state: present
+      with_dict:
+        192.168.56.11: "ldap-server backup-server"
+        192.168.56.22: "client-bullseye"
+        192.168.56.41: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
+        192.168.56.42: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3"
 
 - hosts: clients
   become: true