diff --git a/roles/backup_client/molecule/default/prepare.yml b/roles/backup_client/molecule/default/prepare.yml
index cbf873b019caa40803532c5e47005ea393e4ffb3..8bf085c6f7df3a7fdb8133d90fa225d7a19ceb9a 100644
--- a/roles/backup_client/molecule/default/prepare.yml
+++ b/roles/backup_client/molecule/default/prepare.yml
@@ -85,8 +85,8 @@
         mode: 0755
       with_items:
         - /home/backupuser
-        - /home/bak-parameters-mandatory-s64
-        - /home/bak-parameters-mandatory-b64
+        - /home/bak-param-mandatory-buster
+        - /home/bak-param-mandatory-buster
 
     - name: Set-up duplicity backup directories
       file:
@@ -106,8 +106,7 @@
         group: backupuser
         mode: 0700
       with_items:
-        - "parameters-optional-s64"
-        - "parameters-optional-b64"
+        - "param-optional-buster"
 
   handlers:
     - name: Restart ssh
@@ -117,9 +116,7 @@
 
   vars:
     backup_users:
-      - name: bak-parameters-mandatory-s64
-        key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}"
-      - name: bak-parameters-mandatory-b64
+      - name: bak-param-mandatory-buster
         key: "{{ lookup('file', 'tests/data/ssh/parameters-mandatory.pub') }}"
       - name: backupuser
         key: "{{ lookup('file', 'tests/data/ssh/parameters-optional.pub') }}"