diff --git a/execution/helm/templates/theodolite/crd-benchmark.yaml b/execution/helm/templates/theodolite/crd-benchmark.yaml
index 798950bc05be9ebb6361445619d8a7cb1b9aeff7..084480e1f9e2ef827fb145cd823bbd2f68a20bac 100644
--- a/execution/helm/templates/theodolite/crd-benchmark.yaml
+++ b/execution/helm/templates/theodolite/crd-benchmark.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.benchmarkCRD.create -}}
+{{- if .Values.operator.benchmarkCRD.create -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -116,4 +116,4 @@ spec:
     subresources:
       status: {}
   scope: Namespaced
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/execution/helm/templates/theodolite/crd-execution.yaml b/execution/helm/templates/theodolite/crd-execution.yaml
index a1052262fb41c26e0e58b72ded3d8b3c24c40a8d..d9212e0e0576bb54ffcaf51a227e47f42894a742 100644
--- a/execution/helm/templates/theodolite/crd-execution.yaml
+++ b/execution/helm/templates/theodolite/crd-execution.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.operator.executionCRD.create -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -125,4 +126,5 @@ spec:
       jsonPath: .metadata.creationTimestamp
     subresources:
       status: {}
-  scope: Namespaced
\ No newline at end of file
+  scope: Namespaced
+{{- end }}
diff --git a/execution/helm/templates/theodolite/theodolite-operator.yaml b/execution/helm/templates/theodolite/theodolite-operator.yaml
index 2e45632c7cbcbdf88f69875ceb4395f8b9ce3f88..03418c14cf0e34a02d9b2181bae714b364214389 100644
--- a/execution/helm/templates/theodolite/theodolite-operator.yaml
+++ b/execution/helm/templates/theodolite/theodolite-operator.yaml
@@ -19,8 +19,8 @@ spec:
         runAsUser: 0 # Set the permissions for write access to the volumes.
       containers:
         - name: theodolite
-          image: ghcr.io/cau-se/theodolite:theodolite-kotlin-latest
-          imagePullPolicy: Always
+          image: "{{ .Values.operator.image }}:{{ .Values.operator.imageTag }}"
+          imagePullPolicy: "{{ .Values.operator.imagePullPolicy }}"
           env:
             - name: NAMESPACE
               value: {{ .Release.Namespace }}
@@ -35,15 +35,17 @@ spec:
               mountPath: "/deployments/results"
             - name: benchmark-resources
               mountPath: /work/benchmark-resources
-        - name: lag-analysis
-          image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend:theodolite-kotlin-latest
-          imagePullPolicy: Always
+        {{- if .Values.operator.sloChecker.lagTrend.enabled }}
+        - name: lag-trend-slo-checker
+          image: "{{ .Values.operator.sloChecker.lagTrend.image }}:{{ .Values.operator.sloChecker.lagTrend.imageTag }}"
+          imagePullPolicy: "{{ .Values.operator.sloChecker.lagTrend.imagePullPolicy }}"
           ports:
           - containerPort: 80
             name: analysis
           env:
           - name: LOG_LEVEL
             value: INFO
+        {{- end }}
         - name: results-access
           image: busybox:stable
           command:
diff --git a/execution/helm/values.yaml b/execution/helm/values.yaml
index d245e37e6f50d3874a1a5c06bd0156009777a999..375d0b17e65365a8a713f4d8a8eee72154d23ed7 100644
--- a/execution/helm/values.yaml
+++ b/execution/helm/values.yaml
@@ -245,12 +245,22 @@ prometheus:
 ###
 operator:
   enabled: true
+  
+  image: ghcr.io/cau-se/theodolite
+  imageTag: theodolite-kotlin-latest
+  imagePullPolicy: Always
 
-executionCRD:
-  create: true
+  executionCRD:
+    create: true
+  benchmarkCRD:
+    create: true
 
-benchmarkCRD:
-  create: true
+  sloChecker:
+    lagTrend:
+      enabled: true
+      image: ghcr.io/cau-se/theodolite-slo-checker-lag-trend
+      imageTag: theodolite-kotlin-latest
+      imagePullPolicy: Always
 
 serviceAccount:
   create: true