diff --git a/scripts/dev-tools/dev-tools b/scripts/dev-tools/dev-tools
index 3a4e8eb..583a8c1 100755
--- a/scripts/dev-tools/dev-tools
+++ b/scripts/dev-tools/dev-tools
@@ -500,8 +500,17 @@ dev_tools_vcs_command() {
   docker ps -q --filter "name=$container_name" | grep -q . && echo $container_name found || echo $container_name not found
   docker ps -q --filter "name=$container_name" | grep -q . && docker stop -t 120 $container_name && docker rm -fv $container_name
 
+  if [[ -v WORKSPACE_HOME ]];
+  then
+    DEFAULT_WORKSPACE_HOME=$WORKSPACE_HOME
+  else
+    DEFAULT_WORKSPACE_HOME=/media/psf/Home/workspace
+  fi
+
+  echo "Using default workspace path: $DEFAULT_WORKSPACE_HOME"
+
   eval "
-  ./rcstack stack --env-file-path .custom/.dev.env rhodecode -f docker-compose-apps.dev.yaml \
+  WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME ./rcstack stack --env-file-path .custom/.dev.env rhodecode -f docker-compose-apps.dev.yaml \
   run -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_bash --publish 10010:10010 --rm --use-aliases \
   --workdir=\"/home/rhodecode/rhodecode-vcsserver\" \
   --name=\"$container_name\" vcsserver bash"
@@ -515,8 +524,17 @@ dev_tools_ee_command() {
   docker ps -q --filter "name=$container_name" | grep -q . && echo $container_name found || echo $container_name not found
   docker ps -q --filter "name=$container_name" | grep -q . && docker stop $container_name && docker rm -fv $container_name
 
+  if [[ -v WORKSPACE_HOME ]];
+  then
+    DEFAULT_WORKSPACE_HOME=$WORKSPACE_HOME
+  else
+    DEFAULT_WORKSPACE_HOME=/media/psf/Home/workspace
+  fi
+
+  echo "Using default workspace path: $DEFAULT_WORKSPACE_HOME"
+
   eval "
-  ./rcstack stack --env-file-path .custom/.dev.env rhodecode -f docker-compose-apps.dev.yaml \
+  WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME ./rcstack stack --env-file-path .custom/.dev.env rhodecode -f docker-compose-apps.dev.yaml \
   run -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_bash --rm --use-aliases \
   --publish 10020:10020 \
   --workdir=\"/home/rhodecode/rhodecode-enterprise-ee\" \
@@ -532,8 +550,17 @@ dev_tools_ce_command() {
   docker ps -q --filter "name=$container_name" | grep -q . && echo $container_name found || echo $container_name not found
   docker ps -q --filter "name=$container_name" | grep -q . && docker stop -t 120 $container_name && docker rm -fv $container_name
 
+  if [[ -v WORKSPACE_HOME ]];
+  then
+    DEFAULT_WORKSPACE_HOME=$WORKSPACE_HOME
+  else
+    DEFAULT_WORKSPACE_HOME=/media/psf/Home/workspace
+  fi
+
+  echo "Using default workspace path: $DEFAULT_WORKSPACE_HOME"
+
   eval "
-  ./rcstack stack --env-file-path .custom/.dev.env rhodecode -f docker-compose-apps.dev.yaml \
+  WORKSPACE_HOME=$DEFAULT_WORKSPACE_HOME ./rcstack stack --env-file-path .custom/.dev.env rhodecode -f docker-compose-apps.dev.yaml \
   run -e ENV_FILE= -e RC_ENV_FILE= -e RC_APP_TYPE=rhodecode_bash --publish 10020:10020 --rm --use-aliases \
   --workdir=\"/home/rhodecode/rhodecode-enterprise-ce\" \
   --name=\"$container_name\" rhodecode bash"
diff --git a/scripts/rcstack/rcstack b/scripts/rcstack/rcstack
index 05f3548..350a037 100755
--- a/scripts/rcstack/rcstack
+++ b/scripts/rcstack/rcstack
@@ -23,11 +23,11 @@ rcstack_usage() {
     printf "rcstack\n"
     echo
 
-    printf "  CLI for installing and managing RhodeCode Cluster Stack \nSupport:\n  https://community.rhodecode.com\n"
+    printf "  CLI for installing and managing RhodeCode Cluster Stack \nSupport:\n  https://community.rhodecode.com\nDocs: https://docs.rhodecode.com/rcstack\n"
     echo
 
   else
-    printf "rcstack - CLI for installing and managing RhodeCode Cluster Stack \nSupport: https://community.rhodecode.com\n"
+    printf "rcstack - CLI for installing and managing RhodeCode Cluster Stack \nSupport: https://community.rhodecode.com\nDocs: https://docs.rhodecode.com/rcstack\n"
     echo
 
   fi