diff --git a/charts/altinity-clickhouse-operator/Chart.yaml b/charts/altinity-clickhouse-operator/Chart.yaml
index 496e977..ba025f3 100644
--- a/charts/altinity-clickhouse-operator/Chart.yaml
+++ b/charts/altinity-clickhouse-operator/Chart.yaml
@@ -8,7 +8,7 @@ description: |-
   Refer to operator repo for additional information.
 type: application
 version: 0.0.13
-appVersion: 0.18.0
+appVersion: 0.18.1
 home: https://github.com/slamdev/helm-charts/tree/master/charts/altinity-clickhouse-operator
 icon: https://artifacthub.io/image/2d6aa29c-c74f-4bff-bede-ba7e6e0315a7@2x
 maintainers:
diff --git a/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml b/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
index b487ccd..9089615 100644
--- a/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
+++ b/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml
@@ -10,7 +10,7 @@ kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -90,14 +90,10 @@ spec:
             - spec
           properties:
             apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation
-                of an object. Servers should convert recognized schemas to the latest
-                internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
               type: string
             kind:
-              description: 'Kind is a string value representing the REST resource this
-                object represents. Servers may infer this from the endpoint the client
-                submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
               type: string
             metadata:
               type: object
@@ -682,7 +678,6 @@ spec:
                                       # See namePartShardMaxLen const
                                       maxLength: 15
                                       pattern: "^[a-zA-Z0-9-]{0,15}$"
-
                                     definitionType:
                                       type: string
                                       description: "DEPRECATED - to be removed soon"
@@ -1122,7 +1117,6 @@ spec:
                                     type: string
                                   replicaServiceTemplate:
                                     type: string
-
                     podTemplates:
                       type: array
                       description: |
@@ -1225,7 +1219,6 @@ spec:
                               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
                             # nullable: true
                             x-kubernetes-preserve-unknown-fields: true
-
                     volumeClaimTemplates:
                       type: array
                       description: "allows define template for rendering `PVC` kubernetes resource, which would use inside `Pod` for mount clickhouse `data`, clickhouse `logs` or something else"
diff --git a/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml b/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
index 587b53c..7899b71 100644
--- a/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
+++ b/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml
@@ -1,4 +1,3 @@
----
 # Template Parameters:
 #
 # KIND=ClickHouseInstallationTemplate
@@ -11,7 +10,7 @@ kind: CustomResourceDefinition
 metadata:
   name: clickhouseinstallationtemplates.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
@@ -91,14 +90,10 @@ spec:
             - spec
           properties:
             apiVersion:
-              description: 'APIVersion defines the versioned schema of this representation
-                of an object. Servers should convert recognized schemas to the latest
-                internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+              description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
               type: string
             kind:
-              description: 'Kind is a string value representing the REST resource this
-                object represents. Servers may infer this from the endpoint the client
-                submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+              description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
               type: string
             metadata:
               type: object
@@ -683,7 +678,6 @@ spec:
                                       # See namePartShardMaxLen const
                                       maxLength: 15
                                       pattern: "^[a-zA-Z0-9-]{0,15}$"
-
                                     definitionType:
                                       type: string
                                       description: "DEPRECATED - to be removed soon"
@@ -1123,7 +1117,6 @@ spec:
                                     type: string
                                   replicaServiceTemplate:
                                     type: string
-
                     podTemplates:
                       type: array
                       description: |
@@ -1226,7 +1219,6 @@ spec:
                               More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
                             # nullable: true
                             x-kubernetes-preserve-unknown-fields: true
-
                     volumeClaimTemplates:
                       type: array
                       description: "allows define template for rendering `PVC` kubernetes resource, which would use inside `Pod` for mount clickhouse `data`, clickhouse `logs` or something else"
diff --git a/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml b/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
index d257622..515a4c6 100644
--- a/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
+++ b/charts/altinity-clickhouse-operator/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml
@@ -1,4 +1,3 @@
----
 # Template Parameters:
 #
 # NONE
@@ -8,7 +7,7 @@ kind: CustomResourceDefinition
 metadata:
   name: clickhouseoperatorconfigurations.clickhouse.altinity.com
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
 spec:
   group: clickhouse.altinity.com
   scope: Namespaced
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ClusterRole-clickhouse-operator-kube-system.yaml b/charts/altinity-clickhouse-operator/templates/generated/ClusterRole-clickhouse-operator-kube-system.yaml
index 53bc177..3bb1ab7 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ClusterRole-clickhouse-operator-kube-system.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ClusterRole-clickhouse-operator-kube-system.yaml
@@ -13,7 +13,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
 rules:
   - apiGroups:
       - ""
@@ -21,13 +21,13 @@ rules:
       - configmaps
       - services
     verbs:
-      - create
-      - delete
       - get
+      - list
       - patch
       - update
-      - list
       - watch
+      - create
+      - delete
   - apiGroups:
       - ""
     resources:
@@ -47,12 +47,12 @@ rules:
     resources:
       - persistentvolumeclaims
     verbs:
-      - delete
       - get
       - list
       - patch
       - update
       - watch
+      - delete
   - apiGroups:
       - ""
     resources:
@@ -69,22 +69,22 @@ rules:
     resources:
       - statefulsets
     verbs:
-      - create
-      - delete
       - get
+      - list
       - patch
       - update
-      - list
       - watch
+      - create
+      - delete
   - apiGroups:
       - apps
     resources:
       - replicasets
     verbs:
-      - delete
       - get
       - patch
       - update
+      - delete
   - apiGroups:
       - apps
     resourceNames:
@@ -101,22 +101,22 @@ rules:
     resources:
       - poddisruptionbudgets
     verbs:
-      - create
-      - delete
       - get
+      - list
       - patch
       - update
-      - list
       - watch
+      - create
+      - delete
   - apiGroups:
       - clickhouse.altinity.com
     resources:
       - clickhouseinstallations
     verbs:
-      - delete
       - get
       - patch
       - update
+      - delete
   - apiGroups:
       - clickhouse.altinity.com
     resources:
@@ -142,11 +142,11 @@ rules:
       - clickhouseinstallationtemplates/status
       - clickhouseoperatorconfigurations/status
     verbs:
-      - create
-      - delete
       - get
       - update
       - patch
+      - create
+      - delete
   - apiGroups:
       - ""
     resources:
@@ -154,3 +154,10 @@ rules:
     verbs:
       - get
       - list
+  - apiGroups:
+      - apiextensions.k8s.io
+    resources:
+      - customresourcedefinitions
+    verbs:
+      - get
+      - list
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ClusterRoleBinding-clickhouse-operator-kube-system.yaml b/charts/altinity-clickhouse-operator/templates/generated/ClusterRoleBinding-clickhouse-operator-kube-system.yaml
index 183bc6b..8c8ab1f 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ClusterRoleBinding-clickhouse-operator-kube-system.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ClusterRoleBinding-clickhouse-operator-kube-system.yaml
@@ -6,7 +6,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-confd-files.yaml b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-confd-files.yaml
index aa3c659..e8a9096 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-confd-files.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-confd-files.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}-confd-files
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
 data:
 {{- if .Values.configs.confdFiles }}
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-configd-files.yaml b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-configd-files.yaml
index 768c1eb..983602b 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-configd-files.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-configd-files.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}-configd-files
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
 data:
 {{- if .Values.configs.configdFiles }}
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-files.yaml b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-files.yaml
index bd0c9b6..5ac2e1b 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-files.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-files.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}-files
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
 data:
 {{- if .Values.configs.files }}
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-templatesd-files.yaml b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-templatesd-files.yaml
index 0b31625..c6131c2 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-templatesd-files.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-templatesd-files.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}-templatesd-files
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
 data:
 {{- if .Values.configs.templatesdFiles }}
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-usersd-files.yaml b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-usersd-files.yaml
index 46c52a7..3f6f8f5 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-usersd-files.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ConfigMap-etc-clickhouse-operator-usersd-files.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}-usersd-files
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
 data:
 {{- if .Values.configs.usersdFiles }}
diff --git a/charts/altinity-clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml b/charts/altinity-clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml
index 749f660..46f8f4d 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/Deployment-clickhouse-operator.yaml
@@ -2,8 +2,8 @@
 #
 # NAMESPACE=kube-system
 # COMMENT=
-# OPERATOR_IMAGE=altinity/clickhouse-operator:0.18.0
-# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.18.0
+# OPERATOR_IMAGE=altinity/clickhouse-operator:0.18.1
+# METRICS_EXPORTER_IMAGE=altinity/metrics-exporter:0.18.1
 #
 # Setup Deployment for clickhouse-operator
 # Deployment would be created in kubectl-specified namespace
@@ -13,7 +13,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
 spec:
   replicas: 1
diff --git a/charts/altinity-clickhouse-operator/templates/generated/Service-clickhouse-operator-metrics.yaml b/charts/altinity-clickhouse-operator/templates/generated/Service-clickhouse-operator-metrics.yaml
index 63c9eda..3b03a67 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/Service-clickhouse-operator-metrics.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/Service-clickhouse-operator-metrics.yaml
@@ -14,7 +14,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.fullname" . }}-metrics
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
 spec:
   ports:
diff --git a/charts/altinity-clickhouse-operator/templates/generated/ServiceAccount-clickhouse-operator.yaml b/charts/altinity-clickhouse-operator/templates/generated/ServiceAccount-clickhouse-operator.yaml
index c36981b..d698667 100644
--- a/charts/altinity-clickhouse-operator/templates/generated/ServiceAccount-clickhouse-operator.yaml
+++ b/charts/altinity-clickhouse-operator/templates/generated/ServiceAccount-clickhouse-operator.yaml
@@ -12,7 +12,7 @@ metadata:
   name: {{ include "altinity-clickhouse-operator.serviceAccountName" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    clickhouse.altinity.com/chop: 0.18.0
+    clickhouse.altinity.com/chop: 0.18.1
     {{- include "altinity-clickhouse-operator.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations: