diff --git a/build.sh b/build.sh
index 04438cd0e8655f647f754bb1b09a1ce7713e1314..309b3a88d6b1a617e2c295fa9c174809be179b5f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,7 @@
-#!/bin/sh
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
 IMAGE=k8r.eu/justjanne/quasseldroid-helper-bot
 TAGS=$(git describe --always --tags HEAD)
 
diff --git a/deploy.sh b/deploy.sh
index aa71078090040d9cde9da9d79cf0c51a7537f4cd..07f1d3b2a2ec455ff4e3801192d49c613714e835 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,4 +1,7 @@
-#!/bin/sh
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
 IMAGE=k8r.eu/justjanne/quasseldroid-helper-bot
 TAGS=$(git describe --always --tags HEAD)
 DEPLOYMENT=quasseldroid-helper-bot