diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c1b24a15427ea6097381bb2b3380cfcc13f2abe..ee4ff1b0df02dfac246d3e52455c2cbc279602ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,24 +1,34 @@
 
-jureca.strong.tiny:
-  variables:
-    CUSTOM_CI_BUILDS_DIR: /p/scratch/cjsc/badwaik1.exacb/$CI_JOB_ID
-  id_tokens:
-    SITE_ID_TOKEN:
-      aud: "https://gitlab.jsc.fz-juelich.de"
-  tags:
-    - jacamar
-    - jureca
-    - login
-    - shell
-  script:
-    - module load JUBE
-    - jutil env activate --budget zam --project cjsc
-    - jube-autorun -r "--tag strong.tiny --outpath ../outpath" simple.yml
-    - jube result --style csv ../outpath > jureca.strong.tiny
-    - module load Python
-    - python -m venv venv
-    - source venv/bin/activate
-    - pip install --upgrade pip
-    - pip install jureap
-    - jureap check jureca.strong.tiny
+include:
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
+    rules:
+      - when: always
+    inputs:
+      prefix: "jureca.single"
+      variant: "single"
+      machine: "jureca"
+      queue: "dc-cpu"
+      project: "cjsc"
+      budget: "zam"
+      is_public: "all"
+      jube_file: "simple.yml"
+      fixture: .setup
+      record: "true"
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@v3
+    rules:
+      - when: always
+    inputs:
+      prefix: "jedi.single"
+      variant: "single"
+      machine: "jedi"
+      queue: "all"
+      project: "cjsc"
+      budget: "zam"
+      is_public: "all"
+      jube_file: "simple.yml"
+      fixture: .setup
+      record: "true"
 
+.setup:
+  script:
+    - echo "No setup needed"