diff --git a/images/linux/scripts/base/apt-mock-remove.sh b/images/linux/scripts/base/apt-mock-remove.sh
index 286a5bcf1..cfa179a9e 100644
--- a/images/linux/scripts/base/apt-mock-remove.sh
+++ b/images/linux/scripts/base/apt-mock-remove.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e 
+#!/bin/bash -e
 
 prefix=/usr/local/bin
 
diff --git a/images/macos/provision/assets/select-xamarin-sdk.sh b/images/macos/provision/assets/select-xamarin-sdk.sh
index 45adc969c..014075ce0 100644
--- a/images/macos/provision/assets/select-xamarin-sdk.sh
+++ b/images/macos/provision/assets/select-xamarin-sdk.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e -o pipefail
 if [ -z "$1" ]; then
   echo "No Xamarin SDK specified."
   exit 0
@@ -19,4 +19,4 @@ do
     echo "Set Current folder for ${FOLDER}"
     sudo rm -f ${FOLDER}/Current
     sudo ln -s ${FOLDER}/${XAMARIN_SDK} ${FOLDER}/Current
-done
\ No newline at end of file
+done
diff --git a/images/macos/provision/core/pipx-packages.sh b/images/macos/provision/core/pipx-packages.sh
index 658600fad..bb6c50589 100644
--- a/images/macos/provision/core/pipx-packages.sh
+++ b/images/macos/provision/core/pipx-packages.sh
@@ -1,3 +1,5 @@
+#!/bin/bash -e -o pipefail
+
 source ~/utils/utils.sh
 
 export PATH="$PATH:/opt/pipx_bin"
@@ -15,4 +17,4 @@ for package in $pipx_packages; do
         echo "Install $package into default python"
         pipx install $package
     fi
-done
\ No newline at end of file
+done