diff --git a/containers/apps/surface/entrypoint-workstation.sh b/containers/apps/surface/entrypoint-workstation.sh
old mode 100644
new mode 100755
diff --git a/containers/scripts/build-workstation.sh b/containers/scripts/build-workstation.sh
old mode 100644
new mode 100755
index a04c2488..57eeb09a
--- a/containers/scripts/build-workstation.sh
+++ b/containers/scripts/build-workstation.sh
@@ -6,12 +6,12 @@ set -e
 
 if [ -n "$GITHUB_WORKSPACE" ]; then
   # If inside GitHub Actions, use GITHUB_WORKSPACE as the repo root
-  REPO_ROOT="$GITHUB_WORKSPACE"
+  CONTAINERS_DIR="$GITHUB_WORKSPACE/containers"
 else
-  REPO_ROOT=$(pwd)
+  CONTAINERS_DIR="$(dirname "$(dirname "$(realpath "${BASH_SOURCE[0]}")")")"
 fi
 
-cd $REPO_ROOT/containers
+cd $CONTAINERS_DIR
 
 docker build --file platform/Dockerfile.x86-nvidia-turbovnc --tag tauv/x86-nvidia-turbovnc-platform .
 docker build --build-arg BASE_IMAGE=tauv/x86-nvidia-turbovnc-platform --file common/Dockerfile.common --tag tauv/x86-nvidia-common .
diff --git a/containers/run.sh b/containers/scripts/run-workstation.sh
old mode 100644
new mode 100755
similarity index 61%
rename from containers/run.sh
rename to containers/scripts/run-workstation.sh
index d579694d..dd3736c9
--- a/containers/run.sh
+++ b/containers/scripts/run-workstation.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#!/bin/bash
-
 # Check if there are any running Docker containers
 if [ "$(docker ps -q)" ]; then
     echo "There are running container. You can see them by running 'docker ps' and stop them by calling 'docker kill <container name>'. Aborting..."
@@ -19,6 +17,16 @@ echo "Using shared folder: $SHARED_DIR"
 
 echo "Starting container, VNC address: http://tauv-dev.lan.local.cmu.edu:60$(id -u | rev | cut -c1-3 | rev)/vnc.html"
 
-rocker --nvidia --privileged --port 60$(id -u | rev | cut -c1-3 | rev):8080 --volume $SHARED_DIR:/shared --volume /dev/shm:/dev/shm -- tauv/x86-nvidia-workstation
+CONTAINERS_DIR="$(dirname "$(dirname "$(realpath "${BASH_SOURCE[0]}")")")"
+TAUV_MONO_DIR="$(dirname "$(dirname "$CONTAINER_DIR")")"
+
+rocker \
+	--nvidia \
+	--privileged \
+	--port 60$(id -u | rev | cut -c1-3 | rev):8080 \
+	--volume $SHARED_DIR:/shared \
+        --volume $TAUV_MONO_DIR:/tauv-mono \
+	--volume /dev/shm:/dev/shm \
+	-- tauv/x86-nvidia-workstation