diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a945193a0b4bb279954025fd1f5b1c9c539706d..d134da2b23fda06f673a615d69429e26312db11e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@
 include:
 #---------------------------------------------------------------------------------------------------# Benchmark Runs
 #---------------------------------------------------------------------------------------------------
-  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@record
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
     rules:
       - when: always
     inputs:
@@ -21,7 +21,7 @@ include:
       fixture: .setup
       usecase: "bigproblem"
       record: "true"
-  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@record
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
     rules:
       - when: never
     inputs:
@@ -35,7 +35,7 @@ include:
       jube_file: "benchmark/jube/shell.yml"
       fixture: .setup
       usecase: "smallproblem"
-  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@record
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
     rules:
       - when: always
     rules:
@@ -52,7 +52,7 @@ include:
       fixture: .setup
       usecase: "smallproblem"
       record: "true"
-  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@record
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
     rules:
       - if: $EXACB_JEDI_EVALUATION_RUN == "true"
     inputs:
@@ -67,7 +67,7 @@ include:
       jube_file: "benchmark/jube/shell.yml"
       fixture: .setup
       record: "true"
-  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@record
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
     rules:
       - if: $QUICKSTART_RUN_STRONG_SMALL == "true"
     inputs:
@@ -80,7 +80,7 @@ include:
       is_public: "all"
       jube_file: "benchmark/jube/shell.yml"
       fixture: .setup
-  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@record
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
     rules:
       - when: never
     inputs:
@@ -95,11 +95,9 @@ include:
       fixture: .setup
 #---------------------------------------------------------------------------------------------------# Report Generation Runs
 #---------------------------------------------------------------------------------------------------
-  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jedi@record
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jedi@v3
     inputs:
       prefix: "quickstart.exacb.evaluation.jedi"
-      machine: "jureca"
-      project: "cjsc"
       pipeline: [ "221551", "221552" ]
       selector: [ "jedi.strong.tiny" , "jureca.strong.tiny" ]
       workload_factor: [ "1.0" , "1.4" ]