diff --git a/build/run.sh b/build/run.sh
index 7e056e9..a947d78 100755
--- a/build/run.sh
+++ b/build/run.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
-if [ ! $(id -u) -eq 0 ]; then
+if [ ! "$(id -u)" -eq 0 ]; then
 	echo "This script may need to be run as root to be able to use docker/docker-compose through it."
 fi
+
+cd "$(dirname "$0")"
+
 docker run \
 	--rm -it \
 	-u $(id -u ${USER}):$(id -g ${USER}) \
diff --git a/konnect/wrapper.sh b/konnect/wrapper.sh
index 4a96e7b..0e0e95e 100755
--- a/konnect/wrapper.sh
+++ b/konnect/wrapper.sh
@@ -9,7 +9,7 @@ dockerize \
 	konnectd serve \
 	--signing-private-key=/kopano/ssl/konnectd-tokens-signing-key.pem \
 	--encryption-secret=/kopano/ssl/konnectd-encryption.key \
-	--iss=https://$FQDN \
+	--iss=https://"$FQDN" \
 	--identifier-registration-conf /etc/kopano/konnectd-identifier-registration.yaml \
 	--identifier-scopes-conf /etc/kopano/konnectd-identifier-scopes.yaml \
 	kc
diff --git a/meet/start-service.sh b/meet/start-service.sh
index 370b328..f2d4b2c 100755
--- a/meet/start-service.sh
+++ b/meet/start-service.sh
@@ -4,13 +4,13 @@ ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
 
 set -eu # unset variables are errors & non-zero return values exit the whole script
 
-if [ ! -e /kopano/$SERVICE_TO_START.py ]; then
+if [ ! -e /kopano/"$SERVICE_TO_START".py ]; then
 	echo "Invalid service specified: $SERVICE_TO_START" | ts
 	exit 1
 fi
 
 echo "Configure service '$SERVICE_TO_START'" | ts
-/usr/bin/python3 /kopano/$SERVICE_TO_START.py
+/usr/bin/python3 /kopano/"$SERVICE_TO_START".py
 
 # allow helper commands given by "docker-compose run"
 if [ $# -gt 0 ]; then