diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8450a93538bdf7c40e7d2bb9854972e73df57a4b..92ac65bd616ef98ac5a875fb7f97807009f8a0d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,21 @@ include:
       is_public: "all"
       jube_file: "benchmark/jube/shell.yml"
       fixture: .setup
+  - component: gitlab.jsc.fz-juelich.de/exacb/catalog/jureap/jube@main
+    rules:
+      - when: always
+    inputs:
+      prefix: "quickstart.exacb.weak.micro.jedi"
+      variant: "weak.micro"
+      machine: "jedi"
+      queue: "all"
+      project: "cjsc"
+      budget: "zam"
+      is_public: "all"
+      jube_file: "benchmark/jube/shell.yml"
+      fixture: .setup
+
+
 
 .setup:
   before_script:
diff --git a/benchmark/jube/shell.yml b/benchmark/jube/shell.yml
index a5c0ec285252d116ce74f05f6d01f4c897fa4f81..204c5567772ed6912ef35891481a77e09a056ed3 100644
--- a/benchmark/jube/shell.yml
+++ b/benchmark/jube/shell.yml
@@ -113,9 +113,18 @@ parameterset:
       - name: bench_variant
         tag: strong.medium
         _: strong.medium
+      - name: bench_variant
+        tag: weak.micro
+        _: weak.micro
       - name: bench_variant
         tag: weak.tiny
         _: weak.tiny
+      - name: bench_variant
+        tag: weak.small
+        _: weak.small
+      - name: bench_variant
+        tag: weak.medium
+        _: weak.medium
       - name: bench_queue
         tag: cluster
         _: cluster
@@ -142,11 +151,28 @@ parameterset:
     parameter:
       # We always use a fixed-size problem for a single node problem
       - name: problem_size
-        tag: bigproblem
+        tag: bigproblem+(single|strong.micro|strong.tiny|strong.small|strong.medium)
         _: 65536
       - name: problem_size
-        tag: smallproblem
+        tag: smallproblem+(single|strong.micro|strong.tiny|strong.small|strong.medium)
         _: 1024
+      - name: problem_size
+        tag: weak.micro|weak.tiny|weak.small|weak.medium
+        mode: python
+        _: |
+            {
+              "1": "1024",
+              "2": "2048",
+              "4": "4096",
+              "8": "8192",
+              "16": "16384",
+              "32": "32768",
+              "64": "65536",
+              "128": "131072",
+              "256": "262144",
+              "512": "524288",
+              "1024": "1048576"
+            }["$nodes"]
   # Specify the system-specific parameters
   - name: systemParam
     # We initialize this parameterset with the  `systemParameter` parameterset from the platform.xml file
@@ -167,6 +193,18 @@ parameterset:
       - name: nodes
         tag: strong.medium
         _: 4, 8, 16
+      - name: nodes
+        tag: weak.micro
+        _: 1, 2, 4
+      - name: nodes
+        tag: weak.tiny
+        _: 1, 2, 4, 8, 16, 32
+      - name: nodes
+        tag: weak.small
+        _: 64, 128, 256
+      - name: nodes
+        tag: weak.medium
+        _: 512, 1024
       # We run the benchmark on a single node with 4 tasks per node
       - name: taskspernode
         _: 4
@@ -205,11 +243,6 @@ step:
           echo "FATAL: required a tag corresponding to bench_queue to be set" 1>&2;
           exit 1;
         fi
-      - |
-        if [ -z "${usecase}" ]; then
-          echo "FATAL: required a tag corresponding to usecase to be set" 1>&2;
-          exit 1;
-        fi
   # Fetch the source as needed
   - name: fetch
     depend: input