diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index d9ef78c..17c6a5f 100644
--- a/charts/quickwit/Chart.yaml
+++ b/charts/quickwit/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: quickwit
 description: Sub-second search & analytics engine on cloud storage.
 type: application
-version: 0.7.10
+version: 0.7.11
 appVersion: "v0.8.2"
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index d8b47a7..c034615 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.control_plane.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -123,3 +124,4 @@ spec:
       {{- if .Values.control_plane.runtimeClassName }}
       runtimeClassName: {{ .Values.control_plane.runtimeClassName | quote }}
       {{- end }}
+{{- end }}
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index a66ceea..2d06fb7 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -314,6 +314,8 @@ metastore:
   runtimeClassName: ""
 
 control_plane:
+  enabled: true
+
   # Extra env for control plane
   extraEnv: {}
     # KEY: VALUE