diff --git a/charts/certificate-issuer/templates/gandi-webhook-secret-reader.yaml b/charts/certificate-issuer/templates/gandi-webhook-secret-reader.yaml
index b3d1491..88cf405 100644
--- a/charts/certificate-issuer/templates/gandi-webhook-secret-reader.yaml
+++ b/charts/certificate-issuer/templates/gandi-webhook-secret-reader.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: cert-manager-gandi-webhook-secret-reader
+  name: {{ .Release.Namespace }}-cert-manager-gandi-webhook-secret-reader  # TODO(giolekva): make namespace part configurable
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
@@ -14,12 +14,12 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: cert-manager-gandi-webhook-secret-reader
+  name: {{ .Release.Namespace }}-cert-manager-gandi-webhook-secret-reader
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: cert-manager-gandi-webhook-secret-reader
+  name: {{ .Release.Namespace }}-cert-manager-gandi-webhook-secret-reader
 subjects:
 - kind: ServiceAccount
   name: {{ .Values.certManager.gandiWebhookSecretReader }}
diff --git a/charts/certificate-issuer/templates/wildcard-certificate-private.yaml b/charts/certificate-issuer/templates/wildcard-certificate-private.yaml
index 408b76c..0300ce8 100644
--- a/charts/certificate-issuer/templates/wildcard-certificate-private.yaml
+++ b/charts/certificate-issuer/templates/wildcard-certificate-private.yaml
@@ -12,4 +12,4 @@
   secretName: cert-wildcard.{{ .Values.private.domain }}
   secretTemplate:
     annotations:
-      kubed.appscode.com/sync: "pcloud-instance-id={{ .Values.pcloudInstanceId }}"
+      kubed.appscode.com/sync: pcloud-instance-id={{ .Values.pcloudInstanceId }}
diff --git a/charts/certificate-issuer/templates/www-certificate-public.yaml b/charts/certificate-issuer/templates/www-certificate-public.yaml
index d6b4dc6..cb0c7ff 100644
--- a/charts/certificate-issuer/templates/www-certificate-public.yaml
+++ b/charts/certificate-issuer/templates/www-certificate-public.yaml
@@ -10,7 +10,7 @@
   issuerRef:
     name: {{ .Values.public.name }}
     kind: ClusterIssuer
-  secretName: cert-www.{{ .Values.private.domain }}
+  secretName: cert-www.{{ .Values.public.domain }}
   secretTemplate:
     annotations:
       kubed.appscode.com/sync: "pcloud-instance-id={{ .Values.pcloudInstanceId }}"