diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2
index 9e88493b2e06d8ce86d7e25174d4da77b0691aa9..3f477ee78dd627f9bf1cda96b70c76b612825bcb 100644
--- a/templates/backup.yaml.j2
+++ b/templates/backup.yaml.j2
@@ -2,7 +2,7 @@ version: "2.1"
 services:
     backup_auth:
         image: tecnativa/duplicity:postgres
-        hostname: backup-auth
+        hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-auth
         environment:
             DST: "swift://auth_{{ inventory_hostname|lower }}"
             PGDATABASE: "none"
@@ -27,9 +27,11 @@ services:
             - auth_ldap_db:/mnt/backup/src/ldap_db:z
             - auth_lemonldap_etc_conf:/mnt/backup/src/lemonldap_etc_conf:z
             - auth_lemonldap_conf:/mnt/backup/src/lemonldap_conf:z
-            - /home/docker/backups/ldap_backup.ldif:/mnt/backup/src/ldap_backup.ldif:z
+            - /home/docker/backups/ldap_backup.ldif:/mnt/backup/src/ldap_backup.ldif:ro
+            - auth_backup_cache:/root/.cache/duplicity/
 
 volumes:
+    auth_backup_cache:
     auth_ldap_config:
         external: true
     auth_ldap_db:
diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2
index 522d72c425b894f75baf62c28e9582cfc282f6bd..6ad52bfd525a9b5a5be51a020309f8436e31f89e 100644
--- a/templates/backup2.yaml.j2
+++ b/templates/backup2.yaml.j2
@@ -2,7 +2,7 @@ version: "2.1"
 services:
     backup_auth:
         image: tecnativa/duplicity:postgres
-        hostname: backup-auth
+        hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-auth
         environment:
             DST: "swift://auth_{{ inventory_hostname|lower }}"
             PGDATABASE: "none"
@@ -27,9 +27,11 @@ services:
             - auth_ldap_db:/mnt/backup/src/ldap_db:z
             - auth_lemonldap_etc_conf:/mnt/backup/src/lemonldap_etc_conf:z
             - auth_lemonldap_conf:/mnt/backup/src/lemonldap_conf:z
-            - /home/docker/backups/ldap_backup.ldif:/mnt/backup/src/ldap_backup.ldif:z
+            - /home/docker/backups/ldap_backup.ldif:/mnt/backup/src/ldap_backup.ldif:ro
+            - auth_backup2_cache:/root/.cache/duplicity/
 
 volumes:
+    auth_backup2_cache:
     auth_ldap_config:
         external: true
     auth_ldap_db: