diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2ac7670955c8a43414219274879ab7f023a87a4..bd1dc504f3780a2eaba578dd96e7ffbb374cbf5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,9 +45,9 @@ build-job-Z2:       # This job runs in the build stage, which runs first.
     - git submodule foreach --recursive git submodule init
     - git fetch --recurse-submodules
     - source set_env.sh
-    - cd ./nanosoc_tech/fpga/
+    - cd $SOCLABS_NANOSOC_TECH_DIR/fpga/
     - make build_fpga FPGA=z2
-    - FILE=../../imp/fpga/output/pynq_z2/overlays/nanosoc_design.bit 
+    - FILE=$SOCLABS_DESIGN_ROOT/imp/fpga/output/pynq_z2/overlays/nanosoc_design.bit 
     - if test -f "$FILE"; then
     -   echo "Build successful"
     - else
@@ -69,9 +69,9 @@ build-job-ZCU104:       # This job runs in the build stage, which runs first.
     - git submodule foreach --recursive git submodule init
     - git fetch --recurse-submodules
     - source set_env.sh
-    - cd ./nanosoc_tech/fpga
+    - cd $SOCLABS_NANOSOC_TECH_DIR/fpga
     - make build_fpga FPGA=zcu104
-    - FILE=../../imp/fpga/output/pynq_zcu104/overlays/nanosoc_design.bit 
+    - FILE=$SOCLABS_DESIGN_ROOT/imp/fpga/output/pynq_zcu104/overlays/nanosoc_design.bit 
     - if test -f "$FILE"; then
     -   echo "Build successful"
     - else