diff --git a/helm/templates/strimzi/kafka-cluster.yaml b/helm/templates/strimzi/kafka-cluster.yaml
index ab0126f28ea5f5d09a6f1bc4c20be8b1698655e2..f8c0112b54249fec6d301a892cbf74b36c2d5cec 100644
--- a/helm/templates/strimzi/kafka-cluster.yaml
+++ b/helm/templates/strimzi/kafka-cluster.yaml
@@ -2,7 +2,7 @@
 apiVersion: kafka.strimzi.io/v1beta2
 kind: Kafka
 metadata:
-  name: theodolite-strimzi
+  name: {{ template "theodolite.fullname" . }}-strimzi
 spec:
   kafka:
     jmxOptions: {}
@@ -28,7 +28,7 @@ spec:
       type: jmxPrometheusExporter
       valueFrom:
         configMapKeyRef:
-          name: kafka-metrics
+          name: {{ template "theodolite.fullname" . }}-kafka-metrics
           key: kafka-metrics-config.yml
   
   kafkaExporter: {}
diff --git a/helm/templates/strimzi/kafka-exporter-podmonitor.yaml b/helm/templates/strimzi/kafka-exporter-podmonitor.yaml
index 016cba1bca9c4044620a13e17ad9389e6b666892..5f34a421775dbfceda2c240dafc287e2a2b462c8 100644
--- a/helm/templates/strimzi/kafka-exporter-podmonitor.yaml
+++ b/helm/templates/strimzi/kafka-exporter-podmonitor.yaml
@@ -9,7 +9,7 @@ spec:
   selector:
     selector:
     matchLabels:
-      strimzi.io/name: theodolite-strimzi-kafka-exporter
+      strimzi.io/name: {{ template "theodolite.fullname" . }}-strimzi-kafka-exporter
   namespaceSelector:
     matchNames:
       - default
diff --git a/helm/templates/strimzi/kafka-metrics-configmap.yaml b/helm/templates/strimzi/kafka-metrics-configmap.yaml
index 179dce05d3bc6e585f0399b8239eb64bda59abcb..ad75bfa6ab9ec89a229125d167b897cb58744c42 100644
--- a/helm/templates/strimzi/kafka-metrics-configmap.yaml
+++ b/helm/templates/strimzi/kafka-metrics-configmap.yaml
@@ -2,7 +2,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: kafka-metrics
+  name: {{ template "theodolite.fullname" . }}-kafka-metrics
   labels:
     app: strimzi
 data:
diff --git a/helm/templates/strimzi/kafka-podmonitor.yaml b/helm/templates/strimzi/kafka-podmonitor.yaml
index 30d66acc1b8d44a96b1bf642c92d24f7cee1335e..6334199cfc26ee9679306a024f8a9ba392bca403 100644
--- a/helm/templates/strimzi/kafka-podmonitor.yaml
+++ b/helm/templates/strimzi/kafka-podmonitor.yaml
@@ -9,10 +9,7 @@ spec:
   selector:
     selector:
     matchLabels:
-      strimzi.io/name: theodolite-strimzi-kafka
-  namespaceSelector:
-    matchNames:
-      - default
+      strimzi.io/name: {{ template "theodolite.fullname" . }}-strimzi-kafka
   podMetricsEndpoints:
   - path: /metrics
     port: tcp-prometheus
diff --git a/slo-checker/record-lag/resources/test-1-rep-success.json b/slo-checker/record-lag/resources/test-1-rep-success.json
index dfe11282720ebfcdd60582b7717da892bc85a923..09320c5f1eb0f96d847ddaa17cbd48c47a989155 100644
--- a/slo-checker/record-lag/resources/test-1-rep-success.json
+++ b/slo-checker/record-lag/resources/test-1-rep-success.json
@@ -3,7 +3,7 @@
         [
             {
                 "metric": {
-                    "group": "theodolite-uc1-application-0.0.1"
+                    "consumergroup": "theodolite-uc1-application-0.0.1"
                 },
                 "values": [
                     [
diff --git a/slo-checker/record-lag/resources/test-3-rep-success.json b/slo-checker/record-lag/resources/test-3-rep-success.json
index cf483f42f3783aecd1f428ac7bbbe2090c4cade0..8e495569367ff802c33d9a64bed5aedcae1aec9e 100644
--- a/slo-checker/record-lag/resources/test-3-rep-success.json
+++ b/slo-checker/record-lag/resources/test-3-rep-success.json
@@ -3,7 +3,7 @@
         [
             {
                 "metric": {
-                    "group": "theodolite-uc1-application-0.0.1"
+                    "consumergroup": "theodolite-uc1-application-0.0.1"
                 },
                 "values": [
                     [