diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1850a7a3616273fc8bac18eaac7350225b07ff65..fe87839ed275bfccc0aeb57392c860db1549395f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ 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 $SOCLABS_NANOSOC_TECH_DIR/fpga/
+    - cd $SOCLABS_NANOSOC_TECH_DIR
     - make build_fpga FPGA=z2
     - FILE=$SOCLABS_DESIGN_ROOT/imp/fpga/output/pynq_z2/overlays/nanosoc_design.bit 
     - if test -f "$FILE"; then
@@ -91,7 +91,7 @@ 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 $SOCLABS_NANOSOC_TECH_DIR/fpga
+    - cd $SOCLABS_NANOSOC_TECH_DIR
     - make build_fpga FPGA=zcu104
     - FILE=$SOCLABS_DESIGN_ROOT/imp/fpga/output/pynq_zcu104/overlays/nanosoc_design.bit 
     - if test -f "$FILE"; then