diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc590f029433f64a0f655dc28c3898c7847e4ab5..a0c372884a0d36d1ad722eafef1831f3e9aa890e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -353,6 +353,20 @@ deploy-uc4-beam-samza:
     JAVA_PROJECT_NAME: "uc4-beam-samza"
     JAVA_PROJECT_DEPS: "beam-commons,uc4-beam"
 
+deploy-uc1-beam-dataflow:
+  extends: .deploy-benchmarks
+  variables:
+    IMAGE_NAME: "theodolite-uc1-beam-dataflow"
+    JAVA_PROJECT_NAME: "uc1-beam-dataflow"
+    JAVA_PROJECT_DEPS: "beam-commons,uc1-beam"
+
+deploy-uc3-beam-dataflow:
+  extends: .deploy-benchmarks
+  variables:
+    IMAGE_NAME: "theodolite-uc3-beam-dataflow"
+    JAVA_PROJECT_NAME: "uc3-beam-dataflow"
+    JAVA_PROJECT_DEPS: "beam-commons,uc3-beam"
+
 deploy-uc1-load-generator:
   extends: .deploy-benchmarks
   variables:
diff --git a/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile b/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile
index cf6ef6675464e3c9d37db492b39fd8a71ec60e63..da250815f693aa09c7c1e9f5c5b3366074c891dc 100644
--- a/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile
+++ b/theodolite-benchmarks/uc1-beam-dataflow/Dockerfile
@@ -1,9 +1,5 @@
 FROM openjdk:11-slim
 
-ENV MAX_SOURCE_PARALLELISM=1024
-
-ADD build/distributions/uc1-beam-samza.tar /
-ADD samza-standalone.properties /
-
-CMD /uc1-beam-samza/bin/uc1-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+ADD build/distributions/uc1-beam-dataflow.tar /
 
+CMD /uc1-beam-dataflow/bin/uc1-beam-dataflow
diff --git a/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile b/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile
index 54979b8e1fa8aa9ac7d073302301bd10cbff5f34..3077c991cb54d27cf6de54faf916ceee49df404e 100644
--- a/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile
+++ b/theodolite-benchmarks/uc3-beam-dataflow/Dockerfile
@@ -1,8 +1,5 @@
 FROM openjdk:11-slim
 
-ENV MAX_SOURCE_PARALLELISM=1024
+ADD build/distributions/uc3-beam-dataflow.tar /
 
-ADD build/distributions/uc3-beam-samza.tar /
-ADD samza-standalone.properties /
-
-CMD /uc3-beam-samza/bin/uc3-beam-samza --configFilePath=samza-standalone.properties --samzaExecutionEnvironment=STANDALONE --maxSourceParallelism=$MAX_SOURCE_PARALLELISM --enableMetrics=false --configOverride="{\"job.coordinator.zk.connect\":\"$SAMZA_JOB_COORDINATOR_ZK_CONNECT\"}"
+CMD /uc3-beam-dataflow/bin/uc3-beam-dataflow