diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml
index 836740c9f6911609b46080e64013fef78a933169..3e101af58cae68e5eb89f80904878d89448c1d78 100644
--- a/roles/mail_server/molecule/default/prepare.yml
+++ b/roles/mail_server/molecule/default/prepare.yml
@@ -18,26 +18,6 @@
         update_cache: true
       changed_when: false
 
-- hosts: jessie
-  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.20: "client1"
-        10.31.127.21: "client2"
-        10.31.127.30: "parameters-mandatory parameters-mandatory-jessie64"
-        10.31.127.31: "parameters-optional parameters-optional-jessie64"
-
 - hosts: stretch
   become: true
   tasks:
@@ -55,8 +35,8 @@
         10.31.127.10: "ldap-server backup-server"
         10.31.127.22: "client1"
         10.31.127.23: "client2"
-        10.31.127.32: "parameters-mandatory parameters-mandatory-jessie64"
-        10.31.127.33: "parameters-optional parameters-optional-jessie64"
+        10.31.127.32: "parameters-mandatory parameters-mandatory-stretch64"
+        10.31.127.33: "parameters-optional parameters-optional-stretch64"
 
 - hosts: client
   become: true