diff --git a/elements/debian/bin/map-services b/elements/debian/bin/map-services
index 2445c5bc..56429d9b 100755
--- a/elements/debian/bin/map-services
+++ b/elements/debian/bin/map-services
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eu
+set -o pipefail
 
 # For Debian map-services is currently a noop
 # We pass through the service name directly
diff --git a/elements/fedora/pre-install.d/01-set-fedora-mirror b/elements/fedora/pre-install.d/01-set-fedora-mirror
index a80236a9..3cafda03 100755
--- a/elements/fedora/pre-install.d/01-set-fedora-mirror
+++ b/elements/fedora/pre-install.d/01-set-fedora-mirror
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-}
 
diff --git a/elements/ubuntu/bin/map-services b/elements/ubuntu/bin/map-services
index 7312b77b..316cf0e9 100755
--- a/elements/ubuntu/bin/map-services
+++ b/elements/ubuntu/bin/map-services
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eu
+set -o pipefail
 
 # For Ubuntu map-services is currently a noop
 # We pass through the service name directly