diff --git a/templates/backup.sh.j2 b/templates/backup.sh.j2
index 42b0ff88cf8eb4293dd91b77aecb3a3fa1912997..495b12ac51f877928efda2b9e03f3a1ae408ab74 100644
--- a/templates/backup.sh.j2
+++ b/templates/backup.sh.j2
@@ -1,8 +1,4 @@
 #!/bin/bash
-
-cd /tmp/
-su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }}
-
 export SWIFT_USERNAME="{{ swift_odoo_username }}"
 export SWIFT_PASSWORD="{{ swift_odoo_password }}"
 export SWIFT_AUTHURL="{{ swift_odoo_authurl }}"
@@ -13,5 +9,7 @@ export SWIFT_REGIONNAME="{{ swift_odoo_regionname }}"
 
 export PASSPHRASE="{{ odoo_backup_pass }}"
 
-duplicity --name backup --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
+cd /tmp/ &&\
+    su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }} &&\
+    duplicity --name backup --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
 duplicity remove-all-but-n-full 5 --force swift://odoo_{{ inventory_hostname|lower }}
diff --git a/templates/backup2.sh.j2 b/templates/backup2.sh.j2
index bc23f12074946b81f7ef1397df87f1d29a6d3b0a..70305308a6bbe677d1ed1083d93567df15298482 100644
--- a/templates/backup2.sh.j2
+++ b/templates/backup2.sh.j2
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-cd /tmp/
-su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }}
-
 export SWIFT_USERNAME="{{ swift_odoo2_username }}"
 export SWIFT_PASSWORD="{{ swift_odoo2_password }}"
 export SWIFT_AUTHURL="{{ swift_odoo2_authurl }}"
@@ -13,5 +10,7 @@ export SWIFT_REGIONNAME="{{ swift_odoo2_regionname }}"
 
 export PASSPHRASE="{{ odoo_backup_pass }}"
 
-duplicity --name backup2 --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
+cd /tmp/ &&\
+    su -c 'pg_dump {{ odoo_db }} --no-owner --no-privileges --format c --file "/tmp/backup-$PGDATABASE.pgdump"' -s /bin/sh {{ odoo_user }} &&\
+    duplicity --name backup2 --full-if-older-than 6D --volsize 200 --include /home/odoo/.local/share/Odoo/filestore/ --include /tmp/backup-$PGDATABASE.pgdump --exclude '**' / swift://odoo_{{ inventory_hostname|lower }}
 duplicity remove-all-but-n-full 5 --force swift://odoo_{{ inventory_hostname|lower }}