diff --git a/charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/templates/crds/crds.yaml b/charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/templates/crds/crds.yaml
index 1fdcc34..e26a8e8 100644
--- a/charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/templates/crds/crds.yaml
+++ b/charts/edb-postgres-distributed-for-kubernetes/charts/edb-postgres-for-kubernetes-lts/templates/crds/crds.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.crds.create }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -16884,3 +16885,4 @@ spec:
     storage: true
     subresources:
       status: {}
+{{- end }}
diff --git a/charts/edb-postgres-distributed-for-kubernetes/templates/deployment.yaml b/charts/edb-postgres-distributed-for-kubernetes/templates/deployment.yaml
index 462d1d6..b018fa1 100644
--- a/charts/edb-postgres-distributed-for-kubernetes/templates/deployment.yaml
+++ b/charts/edb-postgres-distributed-for-kubernetes/templates/deployment.yaml
@@ -34,6 +34,7 @@ spec:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
+        checksum/rbac: {{ include (print $.Template.BasePath "/rbac.yaml") . | sha256sum }}
         checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}