diff --git a/execution/helm/templates/dashboard-config-map.yaml b/execution/helm/templates/grafana/dashboard-config-map.yaml
similarity index 99%
rename from execution/helm/templates/dashboard-config-map.yaml
rename to execution/helm/templates/grafana/dashboard-config-map.yaml
index 87e588f29df7446d0b12000eb53487a9bb88ea6c..1125d7833cc62e78c049436f38b854d926e2a216 100644
--- a/execution/helm/templates/dashboard-config-map.yaml
+++ b/execution/helm/templates/grafana/dashboard-config-map.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: scalability
+  name: {{ template "theodolite.fullname" . }}-grafana-scalability
   labels:
     grafana_dashboard: "1"
 data:
diff --git a/execution/helm/templates/kafka-client.yaml b/execution/helm/templates/kafka/kafka-client.yaml
similarity index 87%
rename from execution/helm/templates/kafka-client.yaml
rename to execution/helm/templates/kafka/kafka-client.yaml
index 853cb768672d8888085a3881df81cbdb806ec39d..02e16d33dfc9595dd16c41fa6bfe1404fd7889ab 100644
--- a/execution/helm/templates/kafka-client.yaml
+++ b/execution/helm/templates/kafka/kafka-client.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Pod
 metadata:
   # name: {{ template "theodolite.fullname" . }}-kafka-client
-  name: kafka-client
+  name: {{ template "theodolite.fullname" . }}-kafka-client
 spec:
   containers:
   - name: kafka-client
diff --git a/execution/helm/templates/service-monitor.yaml b/execution/helm/templates/kafka/service-monitor.yaml
similarity index 83%
rename from execution/helm/templates/service-monitor.yaml
rename to execution/helm/templates/kafka/service-monitor.yaml
index 50e4688cf7f9b919afdc9455462034f682975893..68fd5f7599d36187fa7c4dee2fab211eb263c67d 100644
--- a/execution/helm/templates/service-monitor.yaml
+++ b/execution/helm/templates/kafka/service-monitor.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     app: cp-kafka
     appScope: titan-ccp
-  name: kafka
+  name: {{ template "theodolite.fullname" . }}-cp-kafka
 spec:
   selector:
     matchLabels:
diff --git a/execution/helm/templates/cluster-role-binding.yaml b/execution/helm/templates/prometheus/cluster-role-binding.yaml
similarity index 61%
rename from execution/helm/templates/cluster-role-binding.yaml
rename to execution/helm/templates/prometheus/cluster-role-binding.yaml
index 400a972cdb73dca181b621f49e7a3e79c926e65b..f2f167b94b79ad4db130565777cb8af486762c8c 100644
--- a/execution/helm/templates/cluster-role-binding.yaml
+++ b/execution/helm/templates/prometheus/cluster-role-binding.yaml
@@ -2,13 +2,13 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 subjects:
 - kind: ServiceAccount
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
   namespace: {{ .Release.Namespace }}
 {{- end}}
\ No newline at end of file
diff --git a/execution/helm/templates/cluster-role.yaml b/execution/helm/templates/prometheus/cluster-role.yaml
similarity index 86%
rename from execution/helm/templates/cluster-role.yaml
rename to execution/helm/templates/prometheus/cluster-role.yaml
index 2a272718da1413a466d6afed51b3bca1f37a1fe0..c2fea2205451e01474d1ab7ef1ca342a9d975dc9 100644
--- a/execution/helm/templates/cluster-role.yaml
+++ b/execution/helm/templates/prometheus/cluster-role.yaml
@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 rules:
 - apiGroups: [""]
   resources:
diff --git a/execution/helm/templates/prometheus-datasource-config-map.yaml b/execution/helm/templates/prometheus/datasource-config-map.yaml
similarity index 94%
rename from execution/helm/templates/prometheus-datasource-config-map.yaml
rename to execution/helm/templates/prometheus/datasource-config-map.yaml
index 4e793ff83668ac7a7582a924750ca729d9e277ae..b28157940c4dd7cb05eca3fe04926f6e7726830f 100644
--- a/execution/helm/templates/prometheus-datasource-config-map.yaml
+++ b/execution/helm/templates/prometheus/datasource-config-map.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
   labels:
     grafana_datasource: "1"
 data:
diff --git a/execution/helm/templates/prometheus.yaml b/execution/helm/templates/prometheus/prometheus.yaml
similarity index 86%
rename from execution/helm/templates/prometheus.yaml
rename to execution/helm/templates/prometheus/prometheus.yaml
index a3060798a8a3b000f730525805c0d050becc7a68..4e297b20290be9686b901fa8c76823136c6fabef 100644
--- a/execution/helm/templates/prometheus.yaml
+++ b/execution/helm/templates/prometheus/prometheus.yaml
@@ -4,7 +4,7 @@ kind: Prometheus
 metadata:
   name: {{ template "theodolite.fullname" . }}-prometheus
 spec:
-  serviceAccountName: prometheus
+  serviceAccountName: {{ template "theodolite.fullname" . }}-prometheus
   serviceMonitorSelector:
     matchLabels:
       #app: cp-kafka
diff --git a/execution/helm/templates/service-account.yaml b/execution/helm/templates/prometheus/service-account.yaml
similarity index 65%
rename from execution/helm/templates/service-account.yaml
rename to execution/helm/templates/prometheus/service-account.yaml
index 2e14c8eb8ffd912f3d34d1b94aa481cb497b4b90..090284a0cf3c6bb7ca643ee111b2d62d1bd93fb3 100644
--- a/execution/helm/templates/service-account.yaml
+++ b/execution/helm/templates/prometheus/service-account.yaml
@@ -2,5 +2,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: prometheus
+  name: {{ template "theodolite.fullname" . }}-prometheus
 {{- end}}
\ No newline at end of file