diff --git a/execution/helm/theodolite-chart/templates/kafka-client.yaml b/execution/helm/theodolite-chart/templates/kafka-client.yaml
index 5f0ec73038497a116e755c454d16e0daeaabb402..853cb768672d8888085a3881df81cbdb806ec39d 100644
--- a/execution/helm/theodolite-chart/templates/kafka-client.yaml
+++ b/execution/helm/theodolite-chart/templates/kafka-client.yaml
@@ -2,6 +2,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
+  # name: {{ template "theodolite.fullname" . }}-kafka-client
   name: kafka-client
 spec:
   containers:
diff --git a/execution/helm/theodolite-chart/templates/prometheus.yaml b/execution/helm/theodolite-chart/templates/prometheus.yaml
index 0642ab6acd2e016d0e76f07ffb4d06bdb7f2d608..a3060798a8a3b000f730525805c0d050becc7a68 100644
--- a/execution/helm/theodolite-chart/templates/prometheus.yaml
+++ b/execution/helm/theodolite-chart/templates/prometheus.yaml
@@ -2,7 +2,7 @@
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 spec:
   serviceAccountName: prometheus
   serviceMonitorSelector:
diff --git a/execution/helm/theodolite-chart/templates/tests/test-connection.yaml b/execution/helm/theodolite-chart/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7af87e98920c11bcfaccb27724e6f29fc76771a0
--- /dev/null
+++ b/execution/helm/theodolite-chart/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "theodolite.fullname" . }}-test-prometheus"
+  labels:
+    {{- include "theodolite.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['http://prometheus-operated:9090']
+  restartPolicy: Never
diff --git a/execution/helm/theodolite-chart/templates/zookeeper-client.yaml b/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
index 8d246aef6e0e718bc853adca19d2c137a28f61e8..a4d018bfe4b5727762d71eddec10656da69ce120 100644
--- a/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
+++ b/execution/helm/theodolite-chart/templates/zookeeper-client.yaml
@@ -2,6 +2,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
+  # name: {{ template "theodolite.fullname" . }}-zookeeper-client
   name: zookeeper-client
 spec:
   containers: