diff --git a/helm/templates/kafka/kafka-cluster.yaml b/helm/templates/kafka/kafka-cluster.yaml
index 0d7eccfd279c62f7d996a8e3e41a55a5ebdd4e96..1d6f358d85ca09a6503834e2143ba36a87fee422 100644
--- a/helm/templates/kafka/kafka-cluster.yaml
+++ b/helm/templates/kafka/kafka-cluster.yaml
@@ -30,8 +30,6 @@ spec:
         configMapKeyRef:
           name: {{ template "theodolite.fullname" . }}-kafka-metrics
           key: kafka-metrics-config.yml
-  
-  kafkaExporter: {}
 
   zookeeper:
     {{- with .Values.strimzi.zookeeper.replicas }}
@@ -39,5 +37,14 @@ spec:
       {{- toYaml . | nindent 6 }}
     {{- end }}
     storage:
-      type: ephemeral
+      type: ephemeral 
+
+  kafkaExporter: {}
+
+  {{- if .Values.strimzi.topicOperator.enabled -}}
+  entityOperator:
+    topicOperator: {}
+  {{- end }}
+
+
 {{- end }}
\ No newline at end of file
diff --git a/helm/values.yaml b/helm/values.yaml
index f3f6093d1e66432495f8acfc6db1e7e269330c4e..0f1d4790b6d03d42f6ccc65a5156eb70999867e6 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -173,7 +173,6 @@ strimzi:
     jvmOptions:
       "-Xmx": "512M"
       "-Xms": "512M"
-
   zookeeper:
     replicas: 3
     zooEntrance:
@@ -181,6 +180,8 @@ strimzi:
       zookeeperClient:
         enabled: true
         nodeSelector: {}
+  topicOperator:
+    enabled: false
 
 
 ###