diff --git a/.devcontainer/codespace/devcontainer.json b/.devcontainer/codespace/devcontainer.json
new file mode 100644
index 000000000..a7ed07368
--- /dev/null
+++ b/.devcontainer/codespace/devcontainer.json
@@ -0,0 +1,4 @@
+{
+  "name": "eic-opticks (codespace)",
+  "image": "ghcr.io/bnlnpps/eic-opticks:base"
+}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index b3caeaa38..af36fcce5 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,10 +7,5 @@
     "cacheFrom": [
       "ghcr.io/bnlnpps/eic-opticks:base"
     ]
-  },
-  "workspaceFolder": "/src/eic-opticks",
-  // Mount the project into the container
-  "mounts": [
-    "source=${localWorkspaceFolder},target=/src/eic-opticks,type=bind"
-  ]
+  }
 }
diff --git a/.github/workflows/build-pull-request.yaml b/.github/workflows/build-pull-request.yaml
index 664863933..a96cd4a6d 100644
--- a/.github/workflows/build-pull-request.yaml
+++ b/.github/workflows/build-pull-request.yaml
@@ -74,5 +74,5 @@ jobs:
       - name: Run tests
         if: ${{ matrix.target == 'develop' }}
         run: |
-          docker run --rm ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} /src/eic-opticks/tests/test_opticks.sh
-          docker run --rm ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} /src/eic-opticks/tests/test_simg4ox.sh
+          docker run --rm ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} tests/test_opticks.sh
+          docker run --rm ${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }} tests/test_simg4ox.sh
diff --git a/Dockerfile b/Dockerfile
index 2381b8adb..2317bdc35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ARG CMAKE_VERSION=4.2.1
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt update \
- && apt install -y g++ gcc gzip tar python3 python-is-python3 python3-pip curl \
+ && apt install -y g++ gcc gzip tar python3 python-is-python3 python3-pip curl git \
  && apt clean \
  && rm -rf /var/lib/apt/lists/*
 
@@ -66,7 +66,7 @@ RUN cat /etc/bash.nonint >> /etc/bash.bashrc
 
 ENV BASH_ENV=/etc/bash.nonint
 ENV OPTICKS_PREFIX=/opt/eic-opticks
-ENV OPTICKS_HOME=/src/eic-opticks
+ENV OPTICKS_HOME=/workspaces/eic-opticks
 ENV OPTICKS_BUILD=/opt/eic-opticks/build
 ENV LD_LIBRARY_PATH=${OPTICKS_PREFIX}/lib:${LD_LIBRARY_PATH}
 ENV VIRTUAL_ENV=${OPTICKS_HOME}/.venv