diff --git a/templates/backup.yaml.j2 b/templates/backup.yaml.j2
index 83a8b35cf35ec37743c1f6b427321552f339baa1..d7424b8c8151290cf573d52392ae3f95b5653666 100644
--- a/templates/backup.yaml.j2
+++ b/templates/backup.yaml.j2
@@ -1,7 +1,8 @@
 version: "2.1"
 services:
     backup_mattermost:
-        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('_','') }}-mattermost
         environment:
             DST: "swift://mattermost_{{ inventory_hostname|lower }}"
@@ -16,7 +17,8 @@ services:
             SWIFT_TENANTNAME: "{{ swift_odoo_tenantname }}"
             SWIFT_TENANTID: "{{ swift_odoo_tenantid }}"
             SWIFT_REGIONNAME: "{{ swift_odoo_regionname }}"
-            JOB_300_WHAT: "backup --full-if-older-than 6D"
+            JOB_200_WHEN: "never"
+            JOB_300_WHAT: "pg_dump --no-owner --no-privileges --file $$SRC/$$PGDATABASE.sql && backup --full-if-older-than 6D"
             JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
             JOB_302_WHEN: "daily"
         volumes:
diff --git a/templates/backup2.yaml.j2 b/templates/backup2.yaml.j2
index 08e89f4e55ea98885227aee4659c20a7268b3034..b8d69d045d37a30e3d3d571147f7ba7a1f38663b 100644
--- a/templates/backup2.yaml.j2
+++ b/templates/backup2.yaml.j2
@@ -1,7 +1,8 @@
 version: "2.1"
 services:
     backup_mattermost:
-        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('_','') }}-mattermost
         environment:
             DST: "swift://mattermost_{{ inventory_hostname|lower }}"
@@ -16,7 +17,8 @@ services:
             SWIFT_TENANTNAME: "{{ swift_odoo2_tenantname }}"
             SWIFT_TENANTID: "{{ swift_odoo2_tenantid }}"
             SWIFT_REGIONNAME: "{{ swift_odoo2_regionname }}"
-            JOB_300_WHAT: "backup --full-if-older-than 6D"
+            JOB_200_WHEN: "never"
+            JOB_300_WHAT: "pg_dump --no-owner --no-privileges --file $$SRC/$$PGDATABASE.sql && backup --full-if-older-than 6D"
             JOB_302_WHAT: "dup remove-all-but-n-full 5 --force $$DST $$@"
             JOB_302_WHEN: "daily"
         volumes: