diff --git a/run.sh b/run.sh
index c5cae5d..88f2ac3 100755
--- a/run.sh
+++ b/run.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 
 run_embark () {
-    local EMBARK_DOCKER_MOUNT_SOURCE=${EMBARK_DOCKER_MOUNT_DIR:-$PWD}
-    local EMBARK_DOCKER_MOUNT_TARGET=${EMBARK_DOCKER_MOUNT_DIR:-/dapp}
-    local EMBARK_DOCKER_IMAGE=${EMBARK_DOCKER_IMAGE:-statusim/embark}
-    local EMBARK_DOCKER_RUN=${EMBARK_DOCKER_RUN}
+    local EMBARK_DOCKER_MOUNT_SOURCE="${EMBARK_DOCKER_MOUNT_SOURCE:-$PWD}"
+    local EMBARK_DOCKER_MOUNT_TARGET="${EMBARK_DOCKER_MOUNT_TARGET:-/dapp}"
+    local EMBARK_DOCKER_IMAGE="${EMBARK_DOCKER_IMAGE:-statusim/embark}"
+    local EMBARK_DOCKER_RUN="${EMBARK_DOCKER_RUN}"
     local EMBARK_DOCKER_RUN_INTERACTIVE=${EMBARK_DOCKER_RUN_INTERACTIVE:-false}
     local EMBARK_DOCKER_RUN_OPTS_REPLACE=${EMBARK_DOCKER_RUN_OPTS_REPLACE:-false}
-    local EMBARK_DOCKER_TAG=${EMBARK_DOCKER_TAG:-latest}
+    local EMBARK_DOCKER_TAG="${EMBARK_DOCKER_TAG:-latest}"
 
     local -a run_opts=(
         "-i"