diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 088c19d2a2b343e550ac0d376b100a8443a6eb89..457979b77585fec29707df798ced182312f96d6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,10 +33,8 @@ simulate-nanosoc:
 build-job-Z2:       # This job runs in the build stage, which runs first.
   stage: build
   script:
-    # setup vivado environment for Vivado 2021.1
-    - source /tools/Xilinx/Vivado/2021.1/.settings64-Vivado.sh
     # move to fpga_imp directory and run the fpga build script for pynq z2
-    - cd ../../nanosoc_tech/system/fpga_imp/
+    - cd ./system/fpga_imp/
     - source ../../set_env.sh
     - mkdir -p $NANOSOC_TECH_DIR/system/src/bootrom
     - make -C $NANOSOC_TECH_DIR/system bootrom SIM_TOP_DIR=$NANOSOC_TECH_DIR/sim BOOTROM_BUILD_DIR=$NANOSOC_TECH_DIR/system/src/bootrom TOOL_CHAIN=ds6
@@ -60,10 +58,8 @@ build-job-Z2:       # This job runs in the build stage, which runs first.
 build-job-ZCU104:       # This job runs in the build stage, which runs first.
   stage: build
   script:
-    # setup vivado environment for Vivado 2021.1
-    - source /tools/Xilinx/Vivado/2021.1/.settings64-Vivado.sh
    # move to fpga_imp directory and run the fpga build script for pynq z2 
-    - cd ../../nanosoc_tech/system/fpga_imp/
+    - cd ./system/fpga_imp/
     - source ../../set_env.sh
     - mkdir -p $NANOSOC_TECH_DIR/system/src/bootrom
     - make -C $NANOSOC_TECH_DIR/system bootrom SIM_TOP_DIR=$NANOSOC_TECH_DIR/sim BOOTROM_BUILD_DIR=$NANOSOC_TECH_DIR/system/src/bootrom TOOL_CHAIN=ds5