diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2
index a6ddd96e43fecabf18f0bce1d99dbc5b23388ec6..5c2294113f00f29858ddc619b25fa6a5da30e1be 100644
--- a/templates/backup.yaml.j2
+++ b/templates/backup.yaml.j2
@@ -2,7 +2,7 @@ version: "2.1"
 services:
     backup_etherpad:
         image: tecnativa/duplicity:postgres
-        hostname: backup-etherpad
+        hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-etherpad
         environment:
             DST: "swift://etherpad_{{ inventory_hostname|lower }}"
             PGDATABASE: "{{ pad_db_name }}"
@@ -19,9 +19,12 @@ services:
             JOB_300_WHAT: "backup --full-if-older-than 6D"
             JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
             JOB_302_WHEN: "daily"
+            OPTIONS: "--allow-source-mismatch"
         networks:
             - etherpad_default
             - public
+        volumes:
+            - pad_backup_cache:/root/.cache/duplicity/
         command:
             - /etc/periodic/daily/jobrunner
 
@@ -31,3 +34,6 @@ networks:
     public:
         driver_opts:
             encrypted: 1
+
+volumes:
+    pad_backup_cache:
diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2
index 10cc07e3ccde4287add6d4ae6e86c20093959c96..693698a8f407d3af4696fdbbbc8ab866e089f2ef 100644
--- a/templates/backup2.yaml.j2
+++ b/templates/backup2.yaml.j2
@@ -2,7 +2,7 @@ version: "2.1"
 services:
     backup_etherpad:
         image: tecnativa/duplicity:postgres
-        hostname: backup-etherpad
+        hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-etherpad
         environment:
             DST: "swift://etherpad_{{ inventory_hostname|lower }}"
             PGDATABASE: "{{ pad_db_name }}"
@@ -19,9 +19,12 @@ services:
             JOB_300_WHAT: "backup --full-if-older-than 6D"
             JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
             JOB_302_WHEN: "daily"
+            OPTIONS: "--allow-source-mismatch"
         networks:
             - etherpad_default
             - public
+        volumes:
+            - pad_backup2_cache:/root/.cache/duplicity/
         command:
             - /etc/periodic/daily/jobrunner
 
@@ -31,3 +34,6 @@ networks:
     public:
         driver_opts:
             encrypted: 1
+
+volumes:
+    pad_backup2_cache: