diff --git a/src/spice2x/Dockerfile b/src/spice2x/Dockerfile
index 8f8d482..053d3e8 100644
--- a/src/spice2x/Dockerfile
+++ b/src/spice2x/Dockerfile
@@ -2,5 +2,7 @@ FROM spicetools/deps
 WORKDIR /src
 RUN chown user:user /src
 USER user
-COPY --chown=user:user . /src
+COPY --chown=user:user --from=gitroot . /src/.git
+COPY --chown=user:user . /src/src/spice2x
+WORKDIR /src/src/spice2x
 CMD ["./build_all.sh"]
diff --git a/src/spice2x/build_docker.bat b/src/spice2x/build_docker.bat
index 4d0d2a3..8cbec15 100644
--- a/src/spice2x/build_docker.bat
+++ b/src/spice2x/build_docker.bat
@@ -1,6 +1,6 @@
 docker build --pull external/docker -t spicetools/deps
-docker build . -t spicetools/spice --no-cache
-docker run --rm -it -v %cd%/dist:/src/dist -v %cd%/bin:/src/bin spicetools/spice
+docker build --build-context gitroot=%cd%/../../.git . -t spicetools/spice --no-cache
+docker run --rm -it -v %cd%/dist:/src/src/spice2x/dist -v %cd%/bin:/src/src/spice2x/bin spicetools/spice
 @REM to generate PDBs, set DEBUG to 1 in build_all.sh, place cv2pdb in external\cv2pdb, and run below
 @REM external\cv2pdb\cv2pdb.exe bin\spice2x\spicecfg.exe bin\spice2x\spicecfg-pdb.exe bin\spice2x\spicecfg-pdb.pdb
 @REM external\cv2pdb\cv2pdb.exe bin\spice2x\spice.exe bin\spice2x\spice-pdb.exe bin\spice2x\spice-pdb.pdb
diff --git a/src/spice2x/build_docker.sh b/src/spice2x/build_docker.sh
index 6d63f7e..f4ab350 100644
--- a/src/spice2x/build_docker.sh
+++ b/src/spice2x/build_docker.sh
@@ -2,5 +2,5 @@
 export DOCKER_BUILDKIT=0
 
 docker build --pull $PWD/external/docker -t spicetools/deps --platform linux/x86_64
-docker build . -t spicetools/spice:latest --no-cache
-docker run --rm -it -v $PWD/dist:/src/dist -v $PWD/bin:/src/bin spicetools/spice
+docker build --build-context gitroot=$PWD/../../.git . -t spicetools/spice:latest --no-cache
+docker run --rm -it -v $PWD/dist:/src/src/spice2x/dist -v $PWD/bin:/src/src/spice2x/bin spicetools/spice