diff --git a/config.sh b/config.sh
index 96f91a6b2e2e3879247729b63a6f363254b36079..82685b2954eb7b06d58c304e197cea0ac18ea6bc 100755
--- a/config.sh
+++ b/config.sh
@@ -43,7 +43,7 @@ fi
 NOVNC_DIR=novnc
 NOVNC_URL="$GIT_URL$NOVNC_DIR".git
 if [ "$USE_NOVNC" == "true" ]; then
-novnc_compose_file=" -f ./novnc/docker-compose.yml "
+novnc_compose_file=" -f novnc/docker-compose.yml "
 DOCKER_COMPOSE_FILES+=$"$novnc_compose_file"
 fi
 
@@ -51,7 +51,7 @@ fi
 MUMBLE_DIR=build-mumble-web
 MUMBLE_URL=https://github.com/Johni0702/mumble-web.git
 if [ "$USE_MUMBLE" == "true" ]; then
-mumble_compose_file=" -f ./build-mumble-web/docker-compose.production.yml"
+mumble_compose_file=" -f build-mumble-web/docker-compose.production.yml"
 DOCKER_COMPOSE_FILES+=$"$mumble_compose_file"
 SUB_DOMAINS+="mumble-web"
 fi
diff --git a/setup.sh b/setup.sh
index c8b783811aaa1e74eb49a34c4157016167eb328e..c051361b0e1d68fc88651c3ca9cea3a8172137ae 100755
--- a/setup.sh
+++ b/setup.sh
@@ -64,7 +64,7 @@ clone_repositories
 
 if [ "$USE_JITSI" == "true" ]; then
     git clone $JITSI_URL
-    ./"JITSI_DIR"/setup.sh
+    ./"$JITSI_DIR"/setup.sh
 fi
 
 configure_letsencrypt
diff --git a/tools/update_containers.sh b/tools/update_containers.sh
index d8896087a6b79933e4776224ecac9b4d3c11e2cd..06743825b9f2e2d4a6c8278d83483218777440a7 100755
--- a/tools/update_containers.sh
+++ b/tools/update_containers.sh
@@ -8,17 +8,17 @@ echo "Pulling images"
 echo ""
 
 # pull updated images 
-docker-compose $docker_compose_files pull
+docker-compose "$docker_compose_files" pull
 
 echo "Building images"
 echo ""
 
 # Build new images if neccessary
 if [ "$USE_MUMBLE" == "true" ]; then
-    docker-compose -f $mumble_compose_file build
+    docker-compose -f "$mumble_compose_file" build
 fi
 
 if [ "$USE_NOVNC" == "true" ]; then
-    docker-compose -f $novnc_compose_file build 
+    docker-compose -f "$novnc_compose_file" build 
 fi