diff --git a/ci/.launch_vivado.yml b/ci/.launch_vivado.yml
index a4eb91394741ba5d0a3bc4e5a0a3a968d270c967..04e1f053223f698045af9cf15e03c03703600814 100644
--- a/ci/.launch_vivado.yml
+++ b/ci/.launch_vivado.yml
@@ -1,24 +1,19 @@
 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"
   - local: 'sims.gitlab-ci.yml'
 
 variables:
-  IPBB_OS: "c8"
-  VIVADO_VER: "2023.2"
+  VIVADO_VERSION: "2023.2"
   PROJECT_DEPFILE: ${PROJECT_DEPFILE}
   PROJECT_ALGORITHM: ${PROJECT_ALGORITHM}
   PROJECT_NAME: "dtc"
   EMPHUB_TAG: ${EMPHUB_TAG}
-  IPBB_VER: "dev-2024b-v1.5"
-
-.vivado-job-build:
-  tags:
-    - kubernetes
+  IPBB_VERSION: "dev/2024e"
 
 Generate Declaration Files:
   stage: Generate Files
-  image: python
+  image: registry.cern.ch/docker.io/library/python
   before_script:
     - pip install --extra-index-url https://gitlab.cern.ch/api/v4/projects/186983/packages/pypi/simple dtcgenerator==0.0.6
     - apt-get update && apt-get install -y tree
@@ -33,12 +28,11 @@ Generate Declaration Files:
       - ci/generated-files
 
 Make Project:
-  before_script:
-    - mkdir -p ci/builds
-    - source /opt/Xilinx/Vivado/$VIVADO_VER/settings64.sh
-    - rsync -rv --ignore-missing-args ci/generated-files/* ./ # Move generated files to their correct locations
-    - python3 /ci-tools/setup_project.py $CI_PROJECT_DIR/dependencies.yml
+  needs: 
+    - Check Dependencies
+    - Generate Declaration Files
   script:
+    - rsync -rv --ignore-missing-args ci/generated-files/* ./ci/builds/work/src/dtc/ # Move generated files to their correct locations
     - cd ci/builds/work
     - ipbb proj create vivado $PROJECT_NAME $BUILD_REPO:$PROJECT_ALGORITHM $PROJECT_DEPFILE
     - cd proj/$PROJECT_NAME