diff --git a/incubator/druid/Chart.yaml b/incubator/druid/Chart.yaml
index 7982b47587..c67be0c900 100644
--- a/incubator/druid/Chart.yaml
+++ b/incubator/druid/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.18.1
 description: Apache Druid is a high performance real-time analytics database.
 name: druid
-version: 0.2.4
+version: 0.2.5
 home: https://druid.apache.org/
 icon: https://druid.apache.org/img/druid_nav.png
 maintainers:
diff --git a/incubator/druid/README.md b/incubator/druid/README.md
index 9764ed6472..581f38cd69 100644
--- a/incubator/druid/README.md
+++ b/incubator/druid/README.md
@@ -66,9 +66,11 @@ The following table lists the configurable parameters of the Druid chart and the
 | `image.tag`                              | container image tag                                     | `0.18.1`                                   |
 | `image.pullPolicy`                       | container pull policy                                   | `IfNotPresent`                             |
 | `image.pullSecrets`                      | image pull secrest for private repositoty               | `[]`                                       |
+| `configMap.enabled`                       | enable druid configuration as configmap                   | `true`                                     |
 | `configVars`                              | druid configuration variables for all components         | ``                                         |
 | `gCloudStorage.enabled`                  | look for secret to set google cloud credentials         | `false`                                    |
 | `gCloudStorage.secretName`               | secretName to be mounted as google cloud credentials    | `false`                                    |
+| `broker.enabled`                         | enable broker                                           | `true`                                     |
 | `broker.name`                            | broker component name                                   | `broker`                                   |
 | `broker.replicaCount`                    | broker node replicas (deployment)                       | `1`                                        |
 | `broker.port`                            | port of broker component                                | `8082`                                     |
@@ -84,6 +86,7 @@ The following table lists the configurable parameters of the Druid chart and the
 | `broker.ingress.path`                    | path of the broker api                                  | `/`                                        |
 | `broker.ingress.annotations`             | annotations for the broker api ingress                  | `{}`                                       |
 | `broker.ingress.tls`                     | TLS configuration for the ingress                        | `[]`                                       |
+| `coordinator.enabled`                    | enable coordinator                                      | `true`                                     |
 | `coordinator.name`                       | coordinator component name                              | `coordinator`                              |
 | `coordinator.replicaCount`               | coordinator node replicas (deployment)                  | `1`                                        |
 | `coordinator.port`                       | port of coordinator component                           | `8081`                                     |
@@ -115,6 +118,7 @@ The following table lists the configurable parameters of the Druid chart and the
 | `overlord.ingress.path`                  | path of the overlord api                                | `/`                                        |
 | `overlord.ingress.annotations`           | annotations for the overlord api ingress                | `{}`                                       |
 | `overlord.ingress.tls`                   | TLS configuration for the ingress                        | `[]`                                       |
+| `historical.enabled`                     | enable historical                                       | `true`                                     |
 | `historical.name`                        | historical component name                               | `historical`                               |
 | `historical.replicaCount`                | historical node replicas (statefulset)                  | `1`                                        |
 | `historical.port`                        | port of historical component                            | `8083`                                     |
@@ -135,6 +139,7 @@ The following table lists the configurable parameters of the Druid chart and the
 | `historical.ingress.path`                | path of the historical api                              | `/`                                        |
 | `historical.ingress.annotations`         | annotations for the historical api ingress              | `{}`                                       |
 | `historical.ingress.tls`                 | TLS configuration for the ingress                        | `[]`                                       |
+| `middleManager.enabled`                  | enable middleManager                                    | `true`                                     |
 | `middleManager.name`                     | middleManager component name                            | `middleManager`                            |
 | `middleManager.replicaCount`             | middleManager node replicas (statefulset)               | `1`                                        |
 | `middleManager.port`                     | port of middleManager component                         | `8091`                                     |
diff --git a/incubator/druid/templates/broker/deployment.yaml b/incubator/druid/templates/broker/deployment.yaml
index 6397cf5d2b..632a74ebe1 100644
--- a/incubator/druid/templates/broker/deployment.yaml
+++ b/incubator/druid/templates/broker/deployment.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.broker.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -70,4 +71,5 @@ spec:
     {{- with .Values.image.pullSecrets }}
       imagePullSecrets:
 {{ toYaml . | indent 8 }}
-    {{- end }}
\ No newline at end of file
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/templates/broker/service.yaml b/incubator/druid/templates/broker/service.yaml
index 60e9673588..0c87b8b623 100644
--- a/incubator/druid/templates/broker/service.yaml
+++ b/incubator/druid/templates/broker/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.broker.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
     app: {{ include "druid.name" . }}
     release: {{ .Release.Name }}
     component: {{ .Values.broker.name }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/templates/configmap.yaml b/incubator/druid/templates/configmap.yaml
index fa1c923bcb..a3c1bc7aec 100644
--- a/incubator/druid/templates/configmap.yaml
+++ b/incubator/druid/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.configMap.enabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -29,3 +30,4 @@ data:
 {{- if .Values.gCloudStorage.enabled }}
   GOOGLE_APPLICATION_CREDENTIALS: /var/secrets/google/key.json
 {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/templates/coordinator/deployment.yaml b/incubator/druid/templates/coordinator/deployment.yaml
index 21437b82f7..38d5198ad0 100644
--- a/incubator/druid/templates/coordinator/deployment.yaml
+++ b/incubator/druid/templates/coordinator/deployment.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.coordinator.enabled -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -81,4 +82,5 @@ spec:
     {{- with .Values.image.pullSecrets }}
       imagePullSecrets:
 {{ toYaml . | indent 8 }}
-    {{- end }}
\ No newline at end of file
+    {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/templates/coordinator/service.yaml b/incubator/druid/templates/coordinator/service.yaml
index 96d34e8947..39a58db005 100644
--- a/incubator/druid/templates/coordinator/service.yaml
+++ b/incubator/druid/templates/coordinator/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.coordinator.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
     app: {{ include "druid.name" . }}
     release: {{ .Release.Name }}
     component: {{ .Values.coordinator.name }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/templates/historical/service.yaml b/incubator/druid/templates/historical/service.yaml
index 5100d7c51f..ba229af524 100644
--- a/incubator/druid/templates/historical/service.yaml
+++ b/incubator/druid/templates/historical/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.historical.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
     app: {{ include "druid.name" . }}
     release: {{ .Release.Name }}
     component: {{ .Values.historical.name }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/templates/historical/statefulset.yaml b/incubator/druid/templates/historical/statefulset.yaml
index 5cd701e56c..5597c08657 100644
--- a/incubator/druid/templates/historical/statefulset.yaml
+++ b/incubator/druid/templates/historical/statefulset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.historical.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -131,4 +132,5 @@ spec:
       resources:
         requests:
           storage: "{{ .Values.historical.persistence.size }}"
-  {{ end }}
+  {{- end }}
+{{- end }}
diff --git a/incubator/druid/templates/middleManager/service.yaml b/incubator/druid/templates/middleManager/service.yaml
index 1abfae0dd7..d1bcbf575d 100644
--- a/incubator/druid/templates/middleManager/service.yaml
+++ b/incubator/druid/templates/middleManager/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.middleManager.enabled -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -19,3 +20,4 @@ spec:
     app: {{ include "druid.name" . }}
     release: {{ .Release.Name }}
     component: {{ .Values.middleManager.name }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/templates/middleManager/statefulset.yaml b/incubator/druid/templates/middleManager/statefulset.yaml
index 5ec8bbbe3f..0c2bfcb232 100644
--- a/incubator/druid/templates/middleManager/statefulset.yaml
+++ b/incubator/druid/templates/middleManager/statefulset.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.middleManager.enabled -}}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -131,4 +132,5 @@ spec:
       resources:
         requests:
           storage: "{{ .Values.middleManager.persistence.size }}"
-  {{ end }}
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/incubator/druid/values.yaml b/incubator/druid/values.yaml
index 52003dff7b..47107ac00a 100644
--- a/incubator/druid/values.yaml
+++ b/incubator/druid/values.yaml
@@ -6,6 +6,12 @@ image:
   pullPolicy: IfNotPresent
   pullSecrets: []
 
+configMap:
+  ## If false, configMap will not be applied
+  ##
+  enabled: true
+
+## Define the key value pairs in the configmap
 configVars:
   DRUID_XMX: 1g
   DRUID_XMS: 1g
@@ -35,6 +41,9 @@ gCloudStorage:
   secretName: google-cloud-key
 
 broker:
+  ## If false, broker will not be installed
+  ##
+  enabled: true
   name: broker
   replicaCount: 1
   port: 8082
@@ -42,7 +51,7 @@ broker:
 
   config:
     JAVA_OPTS: "-Xms2G -Xmx2G -XX:MaxDirectMemorySize=8g"
-    # druid_monitoring_monitors: '["org.apache.druid.client.cache.CacheMonitor", "org.apache.druid.server.metrics.QueryCountStatsMonitor", "org.apache.druid.java.util.metrics.SysMonitor"]'
+    # druid_monitoring_monitors: '["org.apache.druid.client.cache.CacheMonitor", "org.apache.druid.server.metrics.QueryCountStatsMonitor"]'
 
   ingress:
     enabled: false
@@ -74,6 +83,9 @@ broker:
   podAnnotations: {}
 
 coordinator:
+  ## If false, coordinator will not be installed
+  ##
+  enabled: true
   name: coordinator
   replicaCount: 1
   port: 8081
@@ -81,6 +93,7 @@ coordinator:
 
   config:
     JAVA_OPTS: "-Xms1G -Xmx1G"
+    # druid_monitoring_monitors: '["org.apache.druid.server.metrics.TaskCountStatsMonitor"]'
 
   ingress:
     enabled: false
@@ -112,6 +125,8 @@ coordinator:
   podAnnotations: {}
 
 overlord:
+  ## If true, the separate overlord will be installed
+  ##
   enabled: false
   name: overlord
   replicaCount: 1
@@ -144,6 +159,9 @@ overlord:
   podAnnotations: {}
 
 historical:
+  ## If false, historical will not be installed
+  ##
+  enabled: true
   name: historical
   replicaCount: 1
   port: 8083
@@ -151,7 +169,7 @@ historical:
 
   config:
     JAVA_OPTS: "-Xms2G -Xmx2G -XX:MaxDirectMemorySize=8g"
-    # druid_monitoring_monitors: '["org.apache.druid.client.cache.CacheMonitor", "org.apache.druid.server.metrics.HistoricalMetricsMonitor", "org.apache.druid.server.metrics.QueryCountStatsMonitor", "org.apache.druid.java.util.metrics.SysMonitor"]'
+    # druid_monitoring_monitors: '["org.apache.druid.client.cache.CacheMonitor", "org.apache.druid.server.metrics.HistoricalMetricsMonitor", "org.apache.druid.server.metrics.QueryCountStatsMonitor"]'
 
   ingress:
     enabled: false
@@ -201,6 +219,9 @@ historical:
     type: RollingUpdate
 
 middleManager:
+  ## If false, middleManager will not be installed
+  ##
+  enabled: true
   name: middle-manager
   replicaCount: 1
   port: 8091
@@ -276,6 +297,8 @@ middleManager:
     type: RollingUpdate
 
 router:
+  ## If false, router will not be installed
+  ##
   enabled: true
   name: router
   replicaCount: 1
@@ -327,9 +350,6 @@ zookeeper:
   env:
     ## The JVM heap size to allocate to Zookeeper
     ZK_HEAP_SIZE: "512M"
-  ## Configure Zookeeper persistence
-  persistence:
-    enabled: true
   ## Configure Zookeeper headless
   headless:
     publishNotReadyAddresses: true
@@ -358,8 +378,6 @@ postgresql:
   postgresqlUsername: druid
   postgresqlPassword: druid
   postgresqlDatabase: druid
-  persistence:
-    enabled: true
   service:
     port: 5432