diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2
index b48beb5553b9a6d529b84d2e9118d201a2e5c6c7..c571f0863e7af03aa64b0a124434148e4e06116b 100644
--- a/templates/backup.yaml.j2
+++ b/templates/backup.yaml.j2
@@ -1,7 +1,8 @@
 version: "2.1"
 services:
     backup_privatebin:
-        image: tecnativa/duplicity:postgres
+        image: remifilament/duplicity:postgres # Until https://github.com/Tecnativa/docker-duplicity/pull/324 is merged
+        # image: ghcr.io/tecnativa/docker-duplicity-postgres:master # Once https://github.com/Tecnativa/docker-duplicity/pull/324 is merged
         hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-privatebin
         environment:
             DST: "swift://privatebin_{{ inventory_hostname|lower }}"
@@ -20,7 +21,6 @@ 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"
         volumes:
             - privatebin_backup_cache:/root/.cache/duplicity/
             - privatebin_data:/mnt/backup/src/privatebin:z
diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2
index 82ca5ae470e9dc4a240a95a66e62a19b54f95034..d248093a774336543fc322e595be01f1e422323f 100644
--- a/templates/backup2.yaml.j2
+++ b/templates/backup2.yaml.j2
@@ -1,7 +1,8 @@
 version: "2.1"
 services:
     backup_privatebin:
-        image: tecnativa/duplicity:postgres
+        image: remifilament/duplicity:postgres # Until https://github.com/Tecnativa/docker-duplicity/pull/324 is merged
+        # image: ghcr.io/tecnativa/docker-duplicity-postgres:master # Once https://github.com/Tecnativa/docker-duplicity/pull/324 is merged
         hostname: {{ inventory_hostname_short | lower | regex_replace('_','') }}-privatebin
         environment:
             DST: "swift://privatebin_{{ inventory_hostname|lower }}"
@@ -20,7 +21,6 @@ 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"
         volumes:
             - privatebin_backup2_cache:/root/.cache/duplicity/
             - privatebin_data:/mnt/backup/src/privatebin:z