diff --git a/execution/infrastructure/zookeeper-client.yaml b/execution/infrastructure/zookeeper-client.yaml
index 9d6d00275c46a888ed4e8ff08533ca245c4a684c..85739bba751be62773f511aa95030e6d71a4a869 100644
--- a/execution/infrastructure/zookeeper-client.yaml
+++ b/execution/infrastructure/zookeeper-client.yaml
@@ -2,10 +2,12 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: zookeeper-client
+  labels:
+    app: zookeeper-client
 spec:
   containers:
   - name: zookeeper-client
-    image: confluentinc/cp-zookeeper:5.4.0
+    image: zookeeper:3.7.0
     command:
       - sh
       - -c
diff --git a/helm/templates/strimzi/kafka-cluster.yaml b/helm/templates/kafka/kafka-cluster.yaml
similarity index 100%
rename from helm/templates/strimzi/kafka-cluster.yaml
rename to helm/templates/kafka/kafka-cluster.yaml
diff --git a/helm/templates/strimzi/kafka-exporter-podmonitor.yaml b/helm/templates/kafka/kafka-exporter-podmonitor.yaml
similarity index 100%
rename from helm/templates/strimzi/kafka-exporter-podmonitor.yaml
rename to helm/templates/kafka/kafka-exporter-podmonitor.yaml
diff --git a/helm/templates/strimzi/kafka-metrics-configmap.yaml b/helm/templates/kafka/kafka-metrics-configmap.yaml
similarity index 100%
rename from helm/templates/strimzi/kafka-metrics-configmap.yaml
rename to helm/templates/kafka/kafka-metrics-configmap.yaml
diff --git a/helm/templates/strimzi/kafka-podmonitor.yaml b/helm/templates/kafka/kafka-podmonitor.yaml
similarity index 100%
rename from helm/templates/strimzi/kafka-podmonitor.yaml
rename to helm/templates/kafka/kafka-podmonitor.yaml
diff --git a/helm/templates/kafka/service-monitor.yaml b/helm/templates/kafka/service-monitor.yaml
deleted file mode 100644
index 68fd5f7599d36187fa7c4dee2fab211eb263c67d..0000000000000000000000000000000000000000
--- a/helm/templates/kafka/service-monitor.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- if .Values.kafkaClient.enabled -}}
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app: cp-kafka
-    appScope: titan-ccp
-  name: {{ template "theodolite.fullname" . }}-cp-kafka
-spec:
-  selector:
-    matchLabels:
-      app: cp-kafka
-  endpoints:
-    - port: metrics
-      interval: 7s
-{{- end}}
diff --git a/helm/templates/kafka/zookeeper-client.yaml b/helm/templates/kafka/zookeeper-client.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2154ec116b71bbb33808d3c32d42170a8d9589da
--- /dev/null
+++ b/helm/templates/kafka/zookeeper-client.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.strimzi.zookeeper.zooEntrance.zookeeperClient.enabled -}}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ template "theodolite.fullname" . }}-kafka-zookeeper-client
+  labels:
+    app: zookeeper-client
+spec:
+  containers:
+  - name: zookeeper-client
+    image: zookeeper:3.7.0
+    command:
+      - sh
+      - -c
+      - "exec tail -f /dev/null"
+    env:
+    - name: ZOOKEEPER_SERVER
+      value: {{ template "theodolite.fullname" . }}-kafka-zoo-entrance:2181
+  {{- with .Values.strimzi.zookeeper.zooEntrance.zookeeperClient.nodeSelector }}
+  nodeSelector:
+    {{- toYaml . | nindent 8 }}
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/helm/templates/strimzi/zookeeper-entrance-deployment.yaml b/helm/templates/kafka/zookeeper-entrance-deployment.yaml
similarity index 100%
rename from helm/templates/strimzi/zookeeper-entrance-deployment.yaml
rename to helm/templates/kafka/zookeeper-entrance-deployment.yaml
diff --git a/helm/templates/strimzi/zookeeper-entrance-network.yaml b/helm/templates/kafka/zookeeper-entrance-network.yaml
similarity index 100%
rename from helm/templates/strimzi/zookeeper-entrance-network.yaml
rename to helm/templates/kafka/zookeeper-entrance-network.yaml
diff --git a/helm/templates/strimzi/zookeeper-entrance-service.yaml b/helm/templates/kafka/zookeeper-entrance-service.yaml
similarity index 100%
rename from helm/templates/strimzi/zookeeper-entrance-service.yaml
rename to helm/templates/kafka/zookeeper-entrance-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
index 1677402fc5a7cd6b25bc4f2b440ba13464f51d0b..3a9c965b85ea4615cc20e537d4b97505bf947da0 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
@@ -18,7 +18,7 @@ spec:
               app: "zookeeper-client"
           container: "zookeeper-client"
         exec:
-          command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc1-application-1"]
+          command: ["bin/zkCli.sh", "-server", "$ZOOKEEPER_SERVER", "deleteall", "/app-theodolite-uc1-application-1"]
           timeoutSeconds: 60
   loadGenerator:
     resources:
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
index 2a52ef26a6b969c12bcb27add90e80b938bf141c..9fafe0082416438b3ce30da2108817098f291993 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
@@ -36,7 +36,7 @@ spec:
               app: "zookeeper-client"
           container: "zookeeper-client"
         exec:
-          command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc2-application-1"]
+          command: ["bin/zkCli.sh", "-server", "$ZOOKEEPER_SERVER", "deleteall", "/app-theodolite-uc2-application-1"]
           timeoutSeconds: 60
   loadGenerator:
     resources:
diff --git a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
index 314b5037cf5548eced5fd01b44a40b8941d1e8a9..656fd0982bbdb0585b09c2433b8ba29789926fb6 100644
--- a/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc3-beam-samza/uc3-beam-samza-benchmark-operator.yaml
@@ -18,7 +18,7 @@ spec:
               app: "zookeeper-client"
           container: "zookeeper-client"
         exec:
-          command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc3-application-1"]
+          command: ["bin/zkCli.sh", "-server", "$ZOOKEEPER_SERVER", "deleteall", "/app-theodolite-uc3-application-1"]
           timeoutSeconds: 60
   loadGenerator:
     resources:
diff --git a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
index cc12390f5e4720828a451f35f42861a5a7f2df2b..949edbb2c97a3899c1844f092691c437f1ee4540 100644
--- a/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc4-beam-samza/uc4-beam-samza-benchmark-operator.yaml
@@ -18,7 +18,7 @@ spec:
               app: "zookeeper-client"
           container: "zookeeper-client"
         exec:
-          command: ["bin/zkCli.sh", "-server", "theodolite-kafka-zoo-entrance:2181", "deleteall", "/app-theodolite-uc4-application-1"]
+          command: ["bin/zkCli.sh", "-server", "$ZOOKEEPER_SERVER", "deleteall", "/app-theodolite-uc4-application-1"]
           timeoutSeconds: 60
   loadGenerator:
     resources: