diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
index 98a0a2631be87176a5161e4bdc29df1b294da64b..607767382b4b2fce406fe3820c0f8c6ed1cef777 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
@@ -16,10 +16,9 @@ spec:
       containers:
         - name: uc1-beam-samza
           image: ghcr.io/cau-se/theodolite-uc1-beam-samza:latest
-          ports:
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
-              value: "theodolite-cp-zookeeper:2181"
+              value: "theodolite-kafka-zoo-entrance:2181"
             - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
index 6b10e34ebd40eb0715d73a4bc997b279e0b40a5e..0db930f5ce0085974298487788237b5c2c26f1f2 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
@@ -18,7 +18,7 @@ spec:
           image: ghcr.io/cau-se/theodolite-uc1-beam-samza:latest
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
-              value: "theodolite-cp-zookeeper:2181"
+              value: "theodolite-kafka-zoo-entrance:2181"
             - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
index b36d00093e08bedd0b158b0d78ad4b2680404899..aff9da6a0f7ee490a94a6f9954c2b3cc8a2b5ed5 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/resources/uc3-beam-samza-deployment.yaml
@@ -16,10 +16,9 @@ spec:
       containers:
         - name: uc3-beam-samza
           image: ghcr.io/cau-se/theodolite-uc3-beam-samza:latest
-          ports:
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
-              value: "theodolite-cp-zookeeper:2181"
+              value: "theodolite-kafka-zoo-entrance:2181"
             - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
index 3e2da71fa551f249827159e4440ecf3ff9214311..c0602d86207d2e63d3eb549b068b0afe2692df21 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/resources/uc4-beam-samza-deployment.yaml
@@ -16,10 +16,9 @@ spec:
       containers:
         - name: uc4-beam-samza
           image: ghcr.io/cau-se/theodolite-uc4-beam-samza:latest
-          ports:
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
-              value: "theodolite-cp-zookeeper:2181"
+              value: "theodolite-kafka-zoo-entrance:2181"
             - name: SAMZA_SYSTEMS_KAFKA_PRODUCER_BOOTSTRAP_SERVERS
               value: "theodolite-kafka-kafka-bootstrap:9092"
             - name: SAMZA_SYSTEMS_KAFKA_CONSUMER_BOOTSTRAP_SERVERS