diff --git a/chart/0.0.1/templates/controller/manager.yaml b/chart/0.0.1/templates/controller/manager.yaml
index 99b861f..8a1c37f 100644
--- a/chart/0.0.1/templates/controller/manager.yaml
+++ b/chart/0.0.1/templates/controller/manager.yaml
@@ -80,7 +80,9 @@ spec:
           readOnly: true
       serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10
+      {{- if .Values.controller.tolerations }}
       tolerations: {{ toYaml .Values.controller.tolerations | nindent 8 }}
+      {{- end }}
       volumes:
       - name: cert
         secret:
diff --git a/chart/0.0.1/templates/webhook/webhook.yaml b/chart/0.0.1/templates/webhook/webhook.yaml
index bfebd47..8225bf0 100644
--- a/chart/0.0.1/templates/webhook/webhook.yaml
+++ b/chart/0.0.1/templates/webhook/webhook.yaml
@@ -2,7 +2,7 @@
 apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
-  name: validating-webhook-configuration
+  name: {{ .Release.Namespace }}-validating-webhook-configuration
   {{- if eq .Values.webhook.certmanager.enable true }}
   annotations:
     cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/operator-webhook-cert
diff --git a/chart/0.0.1/values.yaml b/chart/0.0.1/values.yaml
index b50ebf0..cd24af0 100644
--- a/chart/0.0.1/values.yaml
+++ b/chart/0.0.1/values.yaml
@@ -26,7 +26,7 @@ controller:
     requests:
       cpu: 10m
       memory: 64Mi
-  tolerations: {}
+  tolerations: []
 
   metrics:
     enable: false