diff --git a/contrib/actions/run-build.sh b/contrib/actions/run-build.sh
index c3a279774e82a8afbfa95ac191c990c4f1c74bb3..cdff1e50483494178dae9d6c057b11688e70dab0 100755
--- a/contrib/actions/run-build.sh
+++ b/contrib/actions/run-build.sh
@@ -6,7 +6,7 @@ export BROKEN=1
 export GLUON_AUTOREMOVE=1
 export GLUON_DEPRECATED=1
 export GLUON_SITEDIR="contrib/ci/minimal-site"
-export GLUON_TARGET=$1
+export GLUON_TARGET="$1"
 export BUILD_LOG=1
 
 make update
diff --git a/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh b/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh
index 737cac625571ac1f7b5369822dfb07608c900a5b..91ea0d356794a1dfec4f5e2ffd2eb253dc15a6f8 100755
--- a/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh
+++ b/package/gluon-mesh-batman-adv/files/lib/netifd/proto/gluon_bat0.sh
@@ -37,7 +37,7 @@ proto_gluon_bat0_renew() {
 proto_gluon_bat0_setup() {
 	local config="$1"
 
-	local routing_algo=$(lookup_site 'mesh.batman_adv.routing_algo' 'BATMAN_IV')
+	local routing_algo="$(lookup_site 'mesh.batman_adv.routing_algo' 'BATMAN_IV')"
 
 	local gw_mode
 	json_get_vars gw_mode
diff --git a/package/gluon-setup-mode/files/usr/bin/gluon-enter-setup-mode b/package/gluon-setup-mode/files/usr/bin/gluon-enter-setup-mode
index e20f973d7927c5b69570a493bf48e33d91097748..83862ccbb9ddf20e0c4ea009add81d2030819649 100755
--- a/package/gluon-setup-mode/files/usr/bin/gluon-enter-setup-mode
+++ b/package/gluon-setup-mode/files/usr/bin/gluon-enter-setup-mode
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -euo pipefail
+set -eu
 
 echo "Entering setup mode and rebooting..."
 uci set gluon-setup-mode.@setup_mode[0].enabled='1'