diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0b025fc2d7c84368c6e5d7625f120e449101d3a..1477334427fbf243e575592e9a6dad8183fe0e87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ build-job-Z2:       # This job runs in the build stage, which runs first.
     - cd ../../nanosoc/system/fpga_imp/
     - source ../../set_env.sh
     - mkdir -p $NANOSOC_TECH_DIR/system/src/bootrom
-    - make -C $NANOSOC_TECH_DIR/system bootrom BOOTROM_BUILD_DIR=$NANOSOC_TECH_DIR/system/src/bootrom
+    - make -C $NANOSOC_TECH_DIR/system bootrom BOOTROM_BUILD_DIR=$NANOSOC_TECH_DIR/system/src/bootrom TOOL_CHAIN=ds6
     - if source ./build_fpga_pynq_z2.scr; then echo "Vivado Finished"; fi
     - FILE=./pynq_export/pz2/pynq/overlays/soclabs/design_1.bit 
     - if test -f "$FILE"; then
@@ -73,7 +73,7 @@ build-job-ZCU104:       # This job runs in the build stage, which runs first.
     - cd ../../nanosoc/system/fpga_imp/
     - source ../../set_env.sh
     - mkdir -p $NANOSOC_TECH_DIR/system/src/bootrom
-    - make -C $NANOSOC_TECH_DIR/system bootrom BOOTROM_BUILD_DIR=$NANOSOC_TECH_DIR/system/src/bootrom
+    - make -C $NANOSOC_TECH_DIR/system bootrom BOOTROM_BUILD_DIR=$NANOSOC_TECH_DIR/system/src/bootrom TOOL_CHAIN=ds5
     - if source ./build_fpga_pynq_zcu104.scr; then echo "Vivado Finished"; fi
     - FILE=./pynq_export/pz104/pynq/overlays/soclabs/design_1.bit 
     - if test -f "$FILE"; then