diff --git a/profiles/DerGeret/Arch/install.sh b/profiles/DerGeret/Arch/install.sh
index b2b72cf2..29ca0a37 100755
--- a/profiles/DerGeret/Arch/install.sh
+++ b/profiles/DerGeret/Arch/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 function installDrivers() {
diff --git a/profiles/DerGeret/Arch/setup.sh b/profiles/DerGeret/Arch/setup.sh
index 55f60a75..bfc8bfa8 100755
--- a/profiles/DerGeret/Arch/setup.sh
+++ b/profiles/DerGeret/Arch/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 extraMounts()
diff --git a/profiles/ManuSurface/Arch/install.sh b/profiles/ManuSurface/Arch/install.sh
index 2a0ffc4c..0af84fc1 100755
--- a/profiles/ManuSurface/Arch/install.sh
+++ b/profiles/ManuSurface/Arch/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 function installDrivers() {
diff --git a/profiles/ManuSurface/Arch/setup.sh b/profiles/ManuSurface/Arch/setup.sh
index a8436323..0a0bfc08 100755
--- a/profiles/ManuSurface/Arch/setup.sh
+++ b/profiles/ManuSurface/Arch/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 ARCH_MOUNT_ROOT="/mnt" \
diff --git a/scripts/Arch/OS/install.sh b/scripts/Arch/OS/install.sh
index cfe4218b..29deacad 100755
--- a/scripts/Arch/OS/install.sh
+++ b/scripts/Arch/OS/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 rootDir="${BASH_SOURCE%/*}";
 customPortValhallaSudoConfigFile="/etc/sudoers.d/1337_PortValhalla"
 pushd "$rootDir" > /dev/null;
diff --git a/scripts/Arch/OS/setup.sh b/scripts/Arch/OS/setup.sh
index 95f7a528..deafa1bc 100755
--- a/scripts/Arch/OS/setup.sh
+++ b/scripts/Arch/OS/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 ARCH_TIMEZONE="${ARCH_TIMEZONE:-"Europe/Zurich"}";