diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2
index a4e65d3273bb3d7284567797ae5f5b4303845f57..d152e1a3d7920a2034460d13ed6266f3bcf55afe 100644
--- a/templates/backup.yaml.j2
+++ b/templates/backup.yaml.j2
@@ -5,7 +5,7 @@ services:
             context: .
             dockerfile: Dockerfile-mysql
         image: filament/duplicity:mysql
-        hostname: backup-owcnloud
+        hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-owcnloud
         environment:
             DST: "swift://owncloud_{{ inventory_hostname|lower }}"
             MYSQL_DATABASE: {{ cloud_db_user }}
@@ -26,6 +26,7 @@ services:
             JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
             JOB_302_WHEN: "weekly"
             JOB_700_WHEN: "weekly"
+            OPTIONS: "--allow-source-mismatch"
         volumes:
             - owncloud_owncloud:/mnt/backup/src/owncloud:z
             - ./owncloud:/backups