diff --git a/helm/README.md b/helm/README.md
index 40651d605a020c74fc75650c4709ca5a2dd41a50..bf4fb3c249eada1752ee5c150d01e4e950d30984 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -44,7 +44,7 @@ helm install theodolite . -f preconfigs/one-broker-values.yaml
 
 ## Uninstall this Chart
 
-To uninstall/delete the `theodolite` deployment:
+To uninstall/delete the `theodolite` deployment (by default Helm will be install all CRDs (`exection` and `benchmark`) automatically. If Helm should not install these CRDs, use the flag `--skip-crds`)
 
 ```sh
 helm uninstall theodolite
diff --git a/helm/crds/benchmark.yaml b/helm/crds/benchmark.yaml
new file mode 120000
index 0000000000000000000000000000000000000000..fb100de7a1407462bfb6488a54b7f70014a58474
--- /dev/null
+++ b/helm/crds/benchmark.yaml
@@ -0,0 +1 @@
+./../../theodolite/crd/crd-benchmark.yaml
\ No newline at end of file
diff --git a/helm/crds/execution.yaml b/helm/crds/execution.yaml
new file mode 120000
index 0000000000000000000000000000000000000000..62d268c23c391cd7bbfbaffeaee8af1697dc446a
--- /dev/null
+++ b/helm/crds/execution.yaml
@@ -0,0 +1 @@
+./../../theodolite/crd/crd-execution.yaml
\ No newline at end of file
diff --git a/helm/templates/theodolite/crd-benchmark.yaml b/helm/templates/theodolite/crd-benchmark.yaml
deleted file mode 100644
index 084480e1f9e2ef827fb145cd823bbd2f68a20bac..0000000000000000000000000000000000000000
--- a/helm/templates/theodolite/crd-benchmark.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-{{- if .Values.operator.benchmarkCRD.create -}}
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: benchmarks.theodolite.com
-spec:
-  group: theodolite.com
-  names:
-    kind: benchmark
-    plural: benchmarks
-    shortNames:
-      - bench
-  versions:
-  - name: v1
-    served: true
-    storage: true
-    schema:
-      openAPIV3Schema:
-        type: object
-        required: ["spec"]
-        properties:
-          spec:
-            type: object
-            required: []
-            properties:
-              name:
-                type: string
-              appResource:
-                type: array
-                minItems: 1
-                items:
-                  type: string
-              loadGenResource:
-                type: array
-                minItems: 1
-                items:
-                  type: string
-              resourceTypes:
-                type: array
-                minItems: 1
-                items:
-                  type: object
-                  properties:
-                    typeName:
-                      type: string
-                    patchers:
-                      type: array
-                      minItems: 1
-                      items:
-                        type: object
-                        properties:
-                          type:
-                            type: string
-                            default: ""
-                          resource:
-                            type: string
-                            default: ""
-                          properties:
-                            type: object
-                            additionalProperties: true
-                            x-kubernetes-map-type: "granular"
-                            default: {}
-              loadTypes:
-                type: array
-                minItems: 1
-                items:
-                  type: object
-                  properties:
-                    typeName:
-                      type: string
-                    patchers:
-                      type: array
-                      minItems: 1
-                      items:
-                        type: object
-                        properties:
-                          type:
-                            type: string
-                            default: ""
-                          resource:
-                            type: string
-                            default: ""
-                          properties:
-                            type: object
-                            additionalProperties: true
-                            x-kubernetes-map-type: "granular"
-                            default: {}
-              kafkaConfig:
-                type: object
-                properties:
-                  bootstrapServer:
-                    type: string
-                  topics:
-                    type: array
-                    minItems: 1
-                    items:
-                      type: object
-                      required: []
-                      properties:
-                        name:
-                          type: string
-                          default: ""
-                        numPartitions:
-                          type: integer
-                          default: 0
-                        replicationFactor:
-                          type: integer
-                          default: 0
-                        removeOnly:
-                          type: boolean
-                          default: false
-    additionalPrinterColumns:
-    - name: Age
-      type: date
-      jsonPath: .metadata.creationTimestamp
-    subresources:
-      status: {}
-  scope: Namespaced
-{{- end }}
diff --git a/helm/templates/theodolite/crd-execution.yaml b/helm/templates/theodolite/crd-execution.yaml
deleted file mode 100644
index 163835e9b37aca774983d4f019cc61d4bde06510..0000000000000000000000000000000000000000
--- a/helm/templates/theodolite/crd-execution.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-{{- if .Values.operator.executionCRD.create -}}
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: executions.theodolite.com
-spec:
-  group: theodolite.com
-  names:
-    kind: execution
-    plural: executions
-    shortNames:
-      - exec
-  versions:
-  - name: v1
-    served: true
-    storage: true
-    schema:
-      openAPIV3Schema:
-        type: object
-        required: ["spec"]
-        properties:
-          spec:
-            type: object
-            required: ["benchmark", "load", "resources", "slos", "execution", "configOverrides"]
-            properties:
-              name:
-                type: string
-                default: ""
-              benchmark:
-                type: string
-              load: # definition of the load dimension
-                type: object
-                required: ["loadType", "loadValues"]
-                properties:
-                  loadType:
-                   type: string
-                  loadValues:
-                    type: array
-                    items:
-                      type: integer
-              resources: # definition of the resource dimension
-                type: object
-                required: ["resourceType", "resourceValues"]
-                properties:
-                  resourceType:
-                    type: string
-                  resourceValues:
-                    type: array
-                    items:
-                      type: integer
-              slos: # def of service level objectives
-                type: array
-                items:
-                  type: object
-                  required: ["sloType", "prometheusUrl", "offset"]
-                  properties:
-                    sloType:
-                      description: The type of the SLO. It must match 'lag trend'.
-                      type: string
-                    prometheusUrl:
-                      description: Connection string for Promehteus.
-                      type: string
-                    offset:
-                      description: Hours by which the start and end timestamp will be shifted (for different timezones).
-                      type: integer
-                    properties:
-                        description: (Optional) SLO specific additional arguments.
-                        type: object
-                        additionalProperties: true
-                        x-kubernetes-map-type: "granular"
-                        default: {}
-              execution: # def execution config
-                type: object
-                required: ["strategy", "duration", "repetitions", "restrictions"]
-                properties:
-                  strategy:
-                    type: string
-                  duration:
-                    type: integer
-                  repetitions:
-                    type: integer
-                  loadGenerationDelay:
-                    type: integer
-                  restrictions:
-                    type: array
-                    items:
-                      type: string
-              configOverrides:
-                type: array
-                items:
-                  type: object
-                  properties:
-                    patcher:
-                      type: object
-                      properties:
-                        type:
-                          type: string
-                          default: ""
-                        resource:
-                          type: string
-                          default: ""
-                        properties:
-                            type: object
-                            additionalProperties: true
-                            x-kubernetes-map-type: "granular"
-                            default: {}
-                    value:
-                      type: string
-          status:
-            type: object
-            properties:
-              executionState:
-                description: ""
-                type: string
-              executionDuration:
-                description: "Duration of the execution in seconds"
-                type: string
-    additionalPrinterColumns:
-    - name: STATUS
-      type: string
-      description: State of the execution
-      jsonPath: .status.executionState
-    - name: Duration
-      type: string
-      description: Duration of the execution
-      jsonPath: .status.executionDuration
-    - name: Age
-      type: date
-      jsonPath: .metadata.creationTimestamp
-    subresources:
-      status: {}
-  scope: Namespaced
-{{- end }}
diff --git a/helm/values.yaml b/helm/values.yaml
index 917ec5cdbda7541b56b366aff2412ccf7d856f3b..571cdd629c382a88ca8d4b22234d2d0907fa5fae 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -250,11 +250,6 @@ operator:
   imageTag: latest
   imagePullPolicy: Always
 
-  executionCRD:
-    create: true
-  benchmarkCRD:
-    create: true
-
   sloChecker:
     lagTrend:
       enabled: true