diff --git a/infrastructure/backup/image/resources/backup.sh b/infrastructure/backup/image/resources/backup.sh
index 2b67f4a..3774bdf 100755
--- a/infrastructure/backup/image/resources/backup.sh
+++ b/infrastructure/backup/image/resources/backup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o pipefail
+set -eux
 
 function main() {
     file_env AWS_ACCESS_KEY_ID
diff --git a/infrastructure/backup/image/resources/entrypoint-start-and-wait.sh b/infrastructure/backup/image/resources/entrypoint-start-and-wait.sh
index c6addac..3226fde 100644
--- a/infrastructure/backup/image/resources/entrypoint-start-and-wait.sh
+++ b/infrastructure/backup/image/resources/entrypoint-start-and-wait.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eux
+
 function main() {
     create-pg-pass
 
diff --git a/infrastructure/backup/image/resources/entrypoint.sh b/infrastructure/backup/image/resources/entrypoint.sh
index 96df4f3..ff3cdf7 100755
--- a/infrastructure/backup/image/resources/entrypoint.sh
+++ b/infrastructure/backup/image/resources/entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eux
+
 function main() {
     create-pg-pass
 
diff --git a/infrastructure/backup/image/resources/init.sh b/infrastructure/backup/image/resources/init.sh
index 1f47fa5..c3b5d40 100755
--- a/infrastructure/backup/image/resources/init.sh
+++ b/infrastructure/backup/image/resources/init.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eux
+
 function main() {
     file_env AWS_ACCESS_KEY_ID
     file_env AWS_SECRET_ACCESS_KEY
diff --git a/infrastructure/backup/image/resources/install.sh b/infrastructure/backup/image/resources/install.sh
index 1a8cbd7..9b92c43 100755
--- a/infrastructure/backup/image/resources/install.sh
+++ b/infrastructure/backup/image/resources/install.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eux
+
 apt-get update > /dev/null;
 
 install -m 0700 /tmp/entrypoint.sh /
diff --git a/infrastructure/backup/image/resources/restic-snapshots.sh b/infrastructure/backup/image/resources/restic-snapshots.sh
index 1d97a2c..ad739de 100755
--- a/infrastructure/backup/image/resources/restic-snapshots.sh
+++ b/infrastructure/backup/image/resources/restic-snapshots.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -o pipefail
+set -eux
 
 function main() {
     file_env AWS_ACCESS_KEY_ID
diff --git a/infrastructure/backup/image/resources/restore.sh b/infrastructure/backup/image/resources/restore.sh
index cfc3bd2..c7f1520 100755
--- a/infrastructure/backup/image/resources/restore.sh
+++ b/infrastructure/backup/image/resources/restore.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -Eeo pipefail
+set -eux
 
 function main() {