diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69ab82826fc101fab5862584c210f9bae7bd1b20..3803452921f039c22a117cc0c16161cd464d669f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,27 +1,17 @@
 include:
   - project: "cms-tracker-phase2-data-processing/BE_firmware/emp-pipeline"
-    file: "/ci/templates/vivado-jobs.yml"
+    file: "/ci/templates/vivado-jobs-$PIPELINE_TYPE.yml"
 
 variables:
-  VIVADO_VER: "2023.2"
+  VIVADO_VERSION: "2023.2"
   PROJECT_DEPFILE: top.dep
   PROJECT_ALGORITHM: top/charm
   PROJECT_NAME: mprocessor
   EMPHUB_TAG: $CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA
-  IPBB_VER: "dev-2024b-v1.5"
-
-
-.vivado-job-build:
-  tags:
-    - kubernetes
 
 Make Project:
-  before_script:
-    - mkdir -p ci/builds
-    - source /opt/Xilinx/Vivado/$VIVADO_VER/settings64.sh
-    - python3 /ci-tools/setup_project.py $CI_PROJECT_DIR/dependencies.yml
-    - cp -r $CI_PROJECT_DIR/replacements/* $CI_PROJECT_DIR/ci/builds/work/src/
   script:
+    - cp -r $CI_PROJECT_DIR/replacements/* $CI_PROJECT_DIR/ci/builds/work/src/
     - cd ci/builds/work
     - ipbb proj create vivado $PROJECT_NAME $BUILD_REPO:$PROJECT_ALGORITHM $PROJECT_DEPFILE
     - cd proj/$PROJECT_NAME