diff --git a/helm/designate-certmanager-webhook/Chart.yaml b/helm/designate-certmanager-webhook/Chart.yaml
index e8310af3..a339edcc 100644
--- a/helm/designate-certmanager-webhook/Chart.yaml
+++ b/helm/designate-certmanager-webhook/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "0.2.12"
 description: ACME webhook Implementation for OpenStack Designate
 name: designate-certmanager-webhook
-version: "0.2.12"
+version: "0.2.13"
diff --git a/helm/designate-certmanager-webhook/templates/rbac.yaml b/helm/designate-certmanager-webhook/templates/rbac.yaml
index f7fdeb44..12999d98 100644
--- a/helm/designate-certmanager-webhook/templates/rbac.yaml
+++ b/helm/designate-certmanager-webhook/templates/rbac.yaml
@@ -93,7 +93,7 @@ subjects:
   - apiGroup: ""
     kind: ServiceAccount
     name: {{ .Values.certManager.serviceAccountName }}
-    namespace: {{ .Values.certManager.namespace }}
+    namespace: {{ .Values.certManager.namespace | default .Release.Namespace }}
   - apiGroup: ""
     kind: ServiceAccount
     name: {{ include "designate-certmanager-webhook.fullname" . }}
diff --git a/helm/designate-certmanager-webhook/values.yaml b/helm/designate-certmanager-webhook/values.yaml
index 9955b1a4..13539444 100644
--- a/helm/designate-certmanager-webhook/values.yaml
+++ b/helm/designate-certmanager-webhook/values.yaml
@@ -1,7 +1,7 @@
 replicaCount: 1
 
 certManager:
-  namespace: cert-manager
+  namespace: ~
   serviceAccountName: cert-manager
 
 image: