diff --git a/templates/zshrc b/templates/zshrc
index 5f36bf2..8301c1e 100644
--- a/templates/zshrc
+++ b/templates/zshrc
@@ -228,18 +228,18 @@ EOS
 
     if [ ! -z "$port" ]
     then
-        run_command+=" -p $port"
+        run_command+=" -p \"$port\""
     fi
     for volume in $volumes
     do
-        run_command+=" -v $volume"
+        run_command+=" -v \"$volume\""
     done
     for envvar in $envvars
     do
         run_command+=" -e \"$envvar\""
     done
 
-    run_command+=" -w \"$workdir\" $image $cmd"
+    run_command+=" -w \"$workdir\" \"$image\" $cmd"
 
     eval $run_command
 }