diff --git a/execution/helm/templates/theodolite/benchmarkCRD.yaml b/execution/helm/templates/theodolite/benchmarkCRD.yaml
index 51881dfd6d18521f3fe391c6cb60e8b0ac432f12..9d7468b490fa2f2a6cf829bdcafab8c4bd6fc5bf 100644
--- a/execution/helm/templates/theodolite/benchmarkCRD.yaml
+++ b/execution/helm/templates/theodolite/benchmarkCRD.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.theodolite.benchmarkCRD.create -}}
+{{- if .Values.benchmarkCRD.create -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/execution/helm/templates/theodolite/executionCRD.yaml b/execution/helm/templates/theodolite/executionCRD.yaml
index 66e9a940e934b5629a6139b535c7b0d479f329d7..73b58397b8c1fc15ffef5da74e8f1dbdabaa3a30 100644
--- a/execution/helm/templates/theodolite/executionCRD.yaml
+++ b/execution/helm/templates/theodolite/executionCRD.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.theodolite.executionCRD.create -}}
+{{- if .Values.executionCRD.create -}}
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
diff --git a/execution/helm/templates/theodolite/role-binding.yaml b/execution/helm/templates/theodolite/role-binding.yaml
index 5a4987146175a5c2d8ff0d8c2c97dc8d38cda54b..93d8c34e7bc544c3b0c231e986bc58c792cce38e 100644
--- a/execution/helm/templates/theodolite/role-binding.yaml
+++ b/execution/helm/templates/theodolite/role-binding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.theodolite.rbac.create -}}
+{{- if .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
diff --git a/execution/helm/templates/theodolite/role.yaml b/execution/helm/templates/theodolite/role.yaml
index 6cfedd220865543996afb1c378a9f93e911ec87d..84133c1b7b09ba1390cc5b2f3a0d1a5adb1c1ef3 100644
--- a/execution/helm/templates/theodolite/role.yaml
+++ b/execution/helm/templates/theodolite/role.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.theodolite.rbac.create -}}
+{{- if .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
diff --git a/execution/helm/templates/theodolite/serviceaccount.yaml b/execution/helm/templates/theodolite/serviceaccount.yaml
index cf06ad712e48ab712d65330fa24762b6a84c3b7b..1ee80adc271ca66a29b51a415501bca9d7d8f71d 100644
--- a/execution/helm/templates/theodolite/serviceaccount.yaml
+++ b/execution/helm/templates/theodolite/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.theodolite.serviceAccount.create -}}
+{{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/execution/helm/templates/theodolite/thedolite-operator.yaml b/execution/helm/templates/theodolite/thedolite-operator.yaml
index d53d9d0b3791e453f4a604c09cb236a514722436..6157f7ed5aecb7f1925f71088aeca7fd60cc3d17 100644
--- a/execution/helm/templates/theodolite/thedolite-operator.yaml
+++ b/execution/helm/templates/theodolite/thedolite-operator.yaml
@@ -1,8 +1,8 @@
-{{- if .Values.theodolite.operator.enabled -}}
+{{- if .Values.operator.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "theodolite.fullname" . }}
+  name: {{ include "theodolite.fullname" . }}-operator
 spec:
   selector:
     matchLabels:
@@ -17,10 +17,10 @@ spec:
       serviceAccountName:  {{ include "theodolite.serviceAccountName" . }}
       containers:
         - name: theodolite
-          image: lorenzboguhn/theodolite:latest
+          image: lorenzboguhn/thedolite:latest
           env:
             - name: NAMESPACE
-              value: {{ .Values.theodolite.operator.namespace}}
+              value: {{ .Values.operator.namespace}}
         - name: lag-analysis
           image: benediktwetzel/lag-analysis
           ports:
diff --git a/execution/helm/values.yaml b/execution/helm/values.yaml
index ed820eec13ce9c6196cd42a0cacd04d4cf625710..bbbd99b3bc701289e8f2ebdf4dacdc922196d4c5 100644
--- a/execution/helm/values.yaml
+++ b/execution/helm/values.yaml
@@ -231,19 +231,18 @@ prometheus:
 ###
 # Theodolite Operator
 ###
-theodolite:
-  operator:
-    enabled: true
-    namespace: "default"
+operator:
+  enabled: true
+  namespace: "default"
 
-  executionCRD:
-    create: true
+executionCRD:
+  create: true
 
-  benchmarkCRD:
-    create: true
+benchmarkCRD:
+  create: true
 
-  serviceAccount:
-    create: true
+serviceAccount:
+  create: false
 
-  rbac: 
-    create: true
\ No newline at end of file
+rbac:
+  create: true