diff --git a/0.17/files/docker-entrypoint.sh b/0.17/files/docker-entrypoint.sh
index 2f4fe38..6cc30a6 100755
--- a/0.17/files/docker-entrypoint.sh
+++ b/0.17/files/docker-entrypoint.sh
@@ -1,7 +1,5 @@
-#!/bin/bash -x
-set -euo pipefail
-
-id
+#!/bin/bash
+set -eoux pipefail
 
 FACTORIO_VOL=/factorio
 mkdir -p "$FACTORIO_VOL"
diff --git a/0.17/files/docker-update-mods.sh b/0.17/files/docker-update-mods.sh
index f4e1675..79b4097 100755
--- a/0.17/files/docker-update-mods.sh
+++ b/0.17/files/docker-update-mods.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eou pipefail
 
 if [[ -f /run/secrets/username ]]; then
   USERNAME=$(cat /run/secrets/username)
diff --git a/0.17/files/scenario.sh b/0.17/files/scenario.sh
index 3b890db..b2f2abd 100755
--- a/0.17/files/scenario.sh
+++ b/0.17/files/scenario.sh
@@ -1,10 +1,9 @@
-#!/bin/bash -x
-if [ -z "$1" ]; then
+#!/bin/bash
+set -eoux pipefail
   echo "No argument supplied"
 fi
 SERVER_SCENARIO="$1"
 
-set -euo pipefail
 
 id
 
diff --git a/0.17/files/scenario2map.sh b/0.17/files/scenario2map.sh
index 958fdf2..31d7cd4 100755
--- a/0.17/files/scenario2map.sh
+++ b/0.17/files/scenario2map.sh
@@ -1,5 +1,5 @@
-#!/bin/bash -x
-if [ -z "$1" ]; then
+#!/bin/bash
+set -eoux pipefail
   echo "No argument supplied"
 fi
 SERVER_SCENARIO="$1"
diff --git a/0.17/files/update-mods.sh b/0.17/files/update-mods.sh
index 1cc57d4..d38598c 100755
--- a/0.17/files/update-mods.sh
+++ b/0.17/files/update-mods.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -eou pipefail
 
 FACTORIO_VERSION=$1
 MOD_DIR=$2
diff --git a/build.sh b/build.sh
index 018ed23..3c564bf 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eox pipefail
+set -eoux pipefail
 
 if [ -z "$1" ] && [ -n "$CI" ]; then
   echo "Usage: ./build.sh \$VERSION_SHORT"