diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2
index 9fd8bb0b5f78daabe95fc37b7f13f3ab16b72315..8a42ad05f8e546e4b3e3bae158225dfc02b9c4d5 100644
--- a/templates/backup.yaml.j2
+++ b/templates/backup.yaml.j2
@@ -2,7 +2,7 @@ version: "2.1"
 services:
     backup_gitlab:
         image: tecnativa/duplicity:postgres
-        hostname: backup-gitlab
+        hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-gitlab
         environment:
             DST: "swift://gitlab_{{ inventory_hostname|lower }}"
             PGDATABASE: "none"
@@ -23,9 +23,11 @@ services:
         command:
             - /etc/periodic/daily/jobrunner
         volumes:
+            - gitlab_backup_cache:/root/.cache/duplicity/
             - gitlab_config:/mnt/backup/src/config:z
             - /var/lib/docker/volumes/gitlab_data/_data/backups/:/mnt/backup/src/data_backups:z
 
 volumes:
+    gitlab_backup_cache:
     gitlab_config:
         external: true
diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2
index 9f4e61c81076b6d6f70f6c18b7c7307c0e5db03a..ec54cac4834dba9ddf64ee6ade7dd86c138893a1 100644
--- a/templates/backup2.yaml.j2
+++ b/templates/backup2.yaml.j2
@@ -2,7 +2,7 @@ version: "2.1"
 services:
     backup_gitlab:
         image: tecnativa/duplicity:postgres
-        hostname: backup-gitlab
+        hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-gitlab
         environment:
             DST: "swift://gitlab_{{ inventory_hostname|lower }}"
             PGDATABASE: "none"
@@ -23,9 +23,11 @@ services:
         command:
             - /etc/periodic/daily/jobrunner
         volumes:
+            - gitlab_backup2_cache:/root/.cache/duplicity/
             - gitlab_config:/mnt/backup/src/config:z
             - /var/lib/docker/volumes/gitlab_data/_data/backups/:/mnt/backup/src/data_backups:z
 
 volumes:
+    gitlab_backup2_cache:
     gitlab_config:
         external: true