diff --git a/chart/stable/kubedb/README.md b/chart/stable/kubedb/README.md
index f37f1e705..c064651a6 100644
--- a/chart/stable/kubedb/README.md
+++ b/chart/stable/kubedb/README.md
@@ -54,7 +54,7 @@ The following tables lists the configurable parameters of the KubeDB chart and t
 | `rbac.serviceAccountName`          | ServiceAccount KubeDB will use (ignored if rbac.create=true)       | `default`          |
 | `apiserver.groupPriorityMinimum`   | The minimum priority the group should have.                        | 10000              |
 | `apiserver.versionPriority`        | The ordering of this API inside of the group.                      | 15                 |
-| `apiserver.enableAdmissionWebhook` | Configure apiserver as admission webhooks for KubeDB CRDs          | false              |
+| `apiserver.enableAdmissionWebhook` | Configure apiserver as admission webhooks for KubeDB CRDs          | true               |
 | `apiserver.ca`                     | CA certificate used by main Kubernetes api server                  | ``                 |
 
 
diff --git a/chart/stable/kubedb/templates/apiregistration.yaml b/chart/stable/kubedb/templates/apiregistration.yaml
index 7abfdfaa8..d8b90a3c9 100644
--- a/chart/stable/kubedb/templates/apiregistration.yaml
+++ b/chart/stable/kubedb/templates/apiregistration.yaml
@@ -1,6 +1,6 @@
 {{- $ca := genCA "svc-cat-ca" 3650 }}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- $cn := printf "%s-%s" $name .Release.Name | trunc 63 -}}
+{{- $cn := printf "%s-%s" .Release.Name $name | trunc 63 -}}
 {{- $altName1 := printf "%s.%s" $cn .Release.Namespace }}
 {{- $altName2 := printf "%s.%s.svc" $cn .Release.Namespace }}
 {{- $cert := genSignedCert $cn nil (list $altName1 $altName2) 3650 $ca }}
diff --git a/chart/stable/kubedb/values.yaml b/chart/stable/kubedb/values.yaml
index bc5583c58..e463f981f 100644
--- a/chart/stable/kubedb/values.yaml
+++ b/chart/stable/kubedb/values.yaml
@@ -43,6 +43,6 @@ apiserver:
   # for more information on proper values of this field
   versionPriority: 15
   # enableAdmissionWebhook is used to configure apiserver as admission webhook for KubeDB CRDs
-  enableAdmissionWebhook: false
+  enableAdmissionWebhook: true
   # CA certificate used by main Kubernetes api server
   ca:
diff --git a/docs/setup/install.md b/docs/setup/install.md
index a8fbe0124..6c9e89dd3 100644
--- a/docs/setup/install.md
+++ b/docs/setup/install.md
@@ -130,8 +130,7 @@ $ helm install stable/kubedb --name my-release
 # Kubernetes 1.9.0 or later
 $ helm repo update
 $ helm install stable/kubedb --name my-release \
-  --set apiserver.ca="$(onessl get kube-ca)" \
-  --set apiserver.enableAdmissionWebhook=true
+  --set apiserver.ca="$(onessl get kube-ca)"
 ```
 
 To see the detailed configuration options, visit [here](https://github.com/kubedb/cli/tree/master/chart/stable/kubedb).