diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8f5f5da5..400e85b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,10 +9,10 @@ build:
 
   cache:
     paths:
-      - $CI_BUILDS_DIR/modules
-      - $CI_BUILDS_DIR/tools
-      - $CI_BUILDS_DIR/zephyr
-      - $CI_BUILDS_DIR/bootloader
+      - ci-workspace/modules
+      - ci-workspace/tools
+      - ci-workspace/zephyr
+      - ci-workspace/bootloader
 
   image: $CI_BUILD_IMAGE:v0.1.1
 
@@ -20,12 +20,15 @@ build:
     GIT_CLONE_PATH: $CI_BUILDS_DIR/zmk
 
   before_script:
+    - mkdir ci-workspace && ln -s ./ ci-workspace/zmk
+    - cd ci-workspace/zmk
     - west init -l .
     - west update
     - west config --global zephyr.base-prefer configfile
     - west zephyr-export
 
   script:
+    - cd ci-workspace/zmk
     - west build -b nucleo_wb55rg -- -DSHIELD=petejohanson_handwire
 
 build:dockerimage: