diff --git a/roles/xmpp_server/molecule/default/prepare.yml b/roles/xmpp_server/molecule/default/prepare.yml
index f9487affda50e6c40543cf2df1befaf085015f9b..eec594f4de53d5f57a60e44a9b1e6a24acb72610 100644
--- a/roles/xmpp_server/molecule/default/prepare.yml
+++ b/roles/xmpp_server/molecule/default/prepare.yml
@@ -22,21 +22,6 @@
         - name: ldap-server_ldap
           fqdn:
             - ldap-server
-        - name: parameters-mandatory-stretch64_xmpp
-          fqdn:
-            - parameters-mandatory
-            - domain1
-            - proxy.domain1
-            - conference.domain1
-        - name: parameters-optional-stretch64_xmpp
-          fqdn:
-            - parameters-optional
-            - domain2
-            - proxy.domain2
-            - conference.domain2
-            - domain3
-            - proxy.domain3
-            - conference.domain3
         - name: parameters-mandatory-buster64_xmpp
           fqdn:
             - parameters-mandatory
@@ -90,25 +75,6 @@
         regexp: "host\\.name\\)"
         replace: "host.targetname)"
 
-- hosts: stretch
-  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:
-        10.31.127.10: "ldap-server backup-server"
-        10.31.127.21: "client-stretch"
-        10.31.127.32: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
-        10.31.127.33: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3"
-
 - hosts: buster
   become: true
   tasks:
@@ -123,10 +89,10 @@
         mode: 0644
         state: present
       with_dict:
-        10.31.127.10: "ldap-server backup-server"
-        10.31.127.20: "client-stretch"
-        10.31.127.30: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
-        10.31.127.31: "parameters-optional domain2 proxy.domain2 conference.domain2 domain3 proxy.domain3 conference.domain3"
+        192.168.56.10: "ldap-server backup-server"
+        192.168.56.20: "client-buster"
+        192.168.56.30: "parameters-mandatory domain1 proxy.domain1 conference.domain1"
+        192.168.56.31: "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
       lineinfile:
@@ -138,14 +104,6 @@
         mode: 0644
         state: present
 
-    - name: Deploy lua-ldap package pin for testing Stretch -> Buster upgrade scenario (no need to pin the package in Buster)
-      copy:
-        src: "lua_ldap_backports_pin"
-        dest: "/etc/apt/preferences.d/lua-ldap"
-        owner: root
-        group: root
-        mode: 0644
-
 - hosts: clients
   become: true
   tasks: