diff --git a/charts/quickwit/Chart.yaml b/charts/quickwit/Chart.yaml
index 2264485..67439a9 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.5.4
+version: 0.5.5
 appVersion: "v0.7.1"
 keywords:
   - quickwit
diff --git a/charts/quickwit/templates/control-plane-deployment.yaml b/charts/quickwit/templates/control-plane-deployment.yaml
index b58e26d..dd36e3a 100644
--- a/charts/quickwit/templates/control-plane-deployment.yaml
+++ b/charts/quickwit/templates/control-plane-deployment.yaml
@@ -10,7 +10,7 @@ spec:
     matchLabels:
       {{- include "quickwit.control_plane.selectorLabels" . | nindent 6 }}
   strategy:
-    {{- toYaml .Values.control_plane.updateStrategy | nindent 4 }}      
+    type: Recreate
   template:
     metadata:
       annotations:
diff --git a/charts/quickwit/templates/janitor-deployment.yaml b/charts/quickwit/templates/janitor-deployment.yaml
index c338bd9..a05a42a 100644
--- a/charts/quickwit/templates/janitor-deployment.yaml
+++ b/charts/quickwit/templates/janitor-deployment.yaml
@@ -11,7 +11,7 @@ spec:
     matchLabels:
       {{- include "quickwit.janitor.selectorLabels" . | nindent 6 }}
   strategy:
-    {{- toYaml .Values.janitor.updateStrategy | nindent 4 }}      
+    type: Recreate
   template:
     metadata:
       annotations:
diff --git a/charts/quickwit/templates/service.yaml b/charts/quickwit/templates/service.yaml
index 2d3a957..42d4524 100644
--- a/charts/quickwit/templates/service.yaml
+++ b/charts/quickwit/templates/service.yaml
@@ -71,4 +71,42 @@ spec:
       name: grpc
   selector:
     {{- include "quickwit.metastore.selectorLabels" . | nindent 4 }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "quickwit.fullname" . }}-control-plane
+  labels:
+    {{- include "quickwit.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: 7280
+      targetPort: rest
+      protocol: TCP
+      name: rest
+    - port: 7281
+      targetPort: grpc
+      name: grpc
+  selector:
+    {{- include "quickwit.control_plane.selectorLabels" . | nindent 4 }}
 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "quickwit.fullname" . }}-janitor
+  labels:
+    {{- include "quickwit.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: 7280
+      targetPort: rest
+      protocol: TCP
+      name: rest
+    - port: 7281
+      targetPort: grpc
+      name: grpc
+  selector:
+    {{- include "quickwit.janitor.selectorLabels" . | nindent 4 }}
diff --git a/charts/quickwit/values.yaml b/charts/quickwit/values.yaml
index fd7b3cd..01c9203 100644
--- a/charts/quickwit/values.yaml
+++ b/charts/quickwit/values.yaml
@@ -155,11 +155,6 @@ metastore:
     #   cpu: 100m
     #   memory: 128Mi
 
-  ## Pod distruption budget
-  podDisruptionBudget: {}
-    # maxUnavailable: 1
-    # minAvailable: 2
-
   updateStrategy: {}
     # type: RollingUpdate
 
@@ -187,8 +182,6 @@ metastore:
   affinity: {}
 
 control_plane:
-  replicaCount: 1
-
   # Extra env for control plane
   extraEnv: {}
     # KEY: VALUE
@@ -201,14 +194,6 @@ control_plane:
     #   cpu: 100m
     #   memory: 128Mi
 
-  ## Pod distruption budget
-  podDisruptionBudget: {}
-    # maxUnavailable: 1
-    # minAvailable: 2
-
-  updateStrategy: {}
-    # type: RollingUpdate
-
   startupProbe:
     httpGet:
       path: /health/livez
@@ -248,14 +233,6 @@ janitor:
     #   cpu: 100m
     #   memory: 128Mi
 
-  ## Pod distruption budget
-  podDisruptionBudget: {}
-    # maxUnavailable: 1
-    # minAvailable: 2
-
-  updateStrategy: {}
-    # type: RollingUpdate
-
   startupProbe:
     httpGet:
       path: /health/livez
@@ -306,7 +283,12 @@ bootstrap:
 # Quickwit configuration
 config:
   # Metastore configuration.
-  postgres: {}
+  # Default to `qwdata/indexes` if not set.
+  # S3 metastore
+  # metastore_uri: s3://quickwit/indexes
+  #
+  # Postgres metastore
+  # postgres:
   #   host: ""
   #   port: 5432
   #   database: metastore
@@ -314,6 +296,7 @@ config:
   #   password: ""
   #   max_num_connections: 50
 
+  # Storage configuration.
   # storage:
     # s3:
       # endpoint: "http://custom-s3-endpoint"
@@ -327,6 +310,7 @@ config:
       # access_key: "my-azure-blob-access-key"
 
   default_index_root_uri: s3://quickwit/indexes
+
   # Indexer settings
   # indexer:
   #   split_store_max_num_bytes: 200G