diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index babcf13f2762227ef349a0ec569fef30daadd0a0..57f29e10ab761f4c926bc96909f78d649dbe5f55 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -487,20 +487,56 @@ smoketest-uc3-kstreams:
 smoketest-uc3-beam-flink:
   extends: .smoketest-benchmarks
   needs:
-    - deploy-uc2-beam-flink
-    - deploy-uc2-load-generator
+    - deploy-uc3-beam-flink
+    - deploy-uc3-load-generator
   variables:
-    DOCKER_COMPOSE_DIR: "uc2-beam-flink"
-    JAVA_PROJECT_DEPS: "uc2-beam-flink,uc2-beam,beam-commons,uc2-load-generator,load-generator-commons"
+    DOCKER_COMPOSE_DIR: "uc3-beam-flink"
+    JAVA_PROJECT_DEPS: "uc3-beam-flink,uc3-beam,beam-commons,uc3-load-generator,load-generator-commons"
 
 smoketest-uc3-beam-samza:
   extends: .smoketest-benchmarks
   needs:
-    - deploy-uc2-beam-samza
-    - deploy-uc2-load-generator
+    - deploy-uc3-beam-samza
+    - deploy-uc3-load-generator
   variables:
-    DOCKER_COMPOSE_DIR: "uc2-beam-samza"
-    JAVA_PROJECT_DEPS: "uc2-beam-samza,uc2-beam,beam-commons,uc2-load-generator,load-generator-commons"
+    DOCKER_COMPOSE_DIR: "uc3-beam-samza"
+    JAVA_PROJECT_DEPS: "uc3-beam-samza,uc3-beam,beam-commons,uc3-load-generator,load-generator-commons"
+
+smoketest-uc4-kstreams:
+  extends: .smoketest-benchmarks
+  needs:
+    - deploy-uc4-kstreams
+    - deploy-uc4-load-generator
+  variables:
+    DOCKER_COMPOSE_DIR: "uc4-kstreams"
+    JAVA_PROJECT_DEPS: "uc4-kstreams,kstreams-commons,uc4-load-generator,load-generator-commons"
+
+smoketest-uc4-flink:
+  extends: .smoketest-benchmarks
+  needs:
+    - deploy-uc4-flink
+    - deploy-uc4-load-generator
+  variables:
+    DOCKER_COMPOSE_DIR: "uc4-flink"
+    JAVA_PROJECT_DEPS: "uc4-flink,flink-commons,uc4-load-generator,load-generator-commons"
+
+smoketest-uc4-beam-flink:
+  extends: .smoketest-benchmarks
+  needs:
+    - deploy-uc4-beam-flink
+    - deploy-uc4-load-generator
+  variables:
+    DOCKER_COMPOSE_DIR: "uc4-beam-flink"
+    JAVA_PROJECT_DEPS: "uc4-beam-flink,uc4-beam,beam-commons,uc4-load-generator,load-generator-commons"
+
+smoketest-uc4-beam-samza:
+  extends: .smoketest-benchmarks
+  needs:
+    - deploy-uc4-beam-samza
+    - deploy-uc4-load-generator
+  variables:
+    DOCKER_COMPOSE_DIR: "uc4-beam-samza"
+    JAVA_PROJECT_DEPS: "uc4-beam-samza,uc4-beam,beam-commons,uc4-load-generator,load-generator-commons"
 
 
 # Theodolite Framework