diff --git a/operators/cloudnative-pg/0.0.1/CHANGELOG.md b/operators/cloudnative-pg/0.0.1/CHANGELOG.md
deleted file mode 100644
index b71209616e3..00000000000
--- a/operators/cloudnative-pg/0.0.1/CHANGELOG.md
+++ /dev/null
@@ -1,13 +0,0 @@
-**Important:**
-*for the complete changelog, please refer to the website*
-
-
-
-
-## [cloudnative-pg-0.0.1]cloudnative-pg-0.0.1 (2023-06-03)
-
-### Add
-
-- add cloudnative pg operator chart ([#9332](https://github.com/truecharts/charts/issues/9332))
-  
-  
\ No newline at end of file
diff --git a/operators/cloudnative-pg/0.0.1/app-changelog.md b/operators/cloudnative-pg/0.0.1/app-changelog.md
deleted file mode 100644
index d60d6b4d8d5..00000000000
--- a/operators/cloudnative-pg/0.0.1/app-changelog.md
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-## [cloudnative-pg-0.0.1]cloudnative-pg-0.0.1 (2023-06-03)
-
-### Add
-
-- add cloudnative pg operator chart ([#9332](https://github.com/truecharts/charts/issues/9332))
-  
-  
\ No newline at end of file
diff --git a/operators/cloudnative-pg/0.0.1/charts/common-12.12.0.tgz b/operators/cloudnative-pg/0.0.1/charts/common-12.12.0.tgz
deleted file mode 100644
index f364bc9e1bb..00000000000
Binary files a/operators/cloudnative-pg/0.0.1/charts/common-12.12.0.tgz and /dev/null differ
diff --git a/operators/cloudnative-pg/0.0.2/CHANGELOG.md b/operators/cloudnative-pg/0.0.2/CHANGELOG.md
new file mode 100644
index 00000000000..74c0358eced
--- /dev/null
+++ b/operators/cloudnative-pg/0.0.2/CHANGELOG.md
@@ -0,0 +1,26 @@
+**Important:**
+*for the complete changelog, please refer to the website*
+
+
+
+
+## [cloudnative-pg-0.0.2](https://github.com/truecharts/charts/compare/cloudnative-pg-0.0.1...cloudnative-pg-0.0.2) (2023-06-06)
+
+### Chore
+
+- update helm chart common to 12.12.1 ([#9349](https://github.com/truecharts/charts/issues/9349))
+  
+  ### Fix
+
+- use hardcoded and fixed cnpg-webhook-service servicename ([#9429](https://github.com/truecharts/charts/issues/9429))
+  
+  
+
+
+## [cloudnative-pg-0.0.1]cloudnative-pg-0.0.1 (2023-06-03)
+
+### Add
+
+- add cloudnative pg operator chart ([#9332](https://github.com/truecharts/charts/issues/9332))
+  
+  
\ No newline at end of file
diff --git a/operators/cloudnative-pg/0.0.1/Chart.yaml b/operators/cloudnative-pg/0.0.2/Chart.yaml
similarity index 95%
rename from operators/cloudnative-pg/0.0.1/Chart.yaml
rename to operators/cloudnative-pg/0.0.2/Chart.yaml
index 9ec753ff307..b9035529c8a 100644
--- a/operators/cloudnative-pg/0.0.1/Chart.yaml
+++ b/operators/cloudnative-pg/0.0.2/Chart.yaml
@@ -11,7 +11,7 @@ keywords:
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
-    version: 12.12.0
+    version: 12.12.3
 kubeVersion: ">=1.16.0-0"
 maintainers:
   - email: info@truecharts.org
@@ -23,7 +23,7 @@ sources:
   - https://github.com/cloudnative-pg
   - https://cloudnative-pg.io/
 type: application
-version: 0.0.1
+version: 0.0.2
 annotations:
   truecharts.org/catagories: |
     - operators
diff --git a/operators/cloudnative-pg/0.0.1/LICENSE b/operators/cloudnative-pg/0.0.2/LICENSE
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/LICENSE
rename to operators/cloudnative-pg/0.0.2/LICENSE
diff --git a/operators/cloudnative-pg/0.0.1/README.md b/operators/cloudnative-pg/0.0.2/README.md
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/README.md
rename to operators/cloudnative-pg/0.0.2/README.md
diff --git a/operators/cloudnative-pg/0.0.2/app-changelog.md b/operators/cloudnative-pg/0.0.2/app-changelog.md
new file mode 100644
index 00000000000..1c2fc4acc23
--- /dev/null
+++ b/operators/cloudnative-pg/0.0.2/app-changelog.md
@@ -0,0 +1,13 @@
+
+
+## [cloudnative-pg-0.0.2](https://github.com/truecharts/charts/compare/cloudnative-pg-0.0.1...cloudnative-pg-0.0.2) (2023-06-06)
+
+### Chore
+
+- update helm chart common to 12.12.1 ([#9349](https://github.com/truecharts/charts/issues/9349))
+  
+  ### Fix
+
+- use hardcoded and fixed cnpg-webhook-service servicename ([#9429](https://github.com/truecharts/charts/issues/9429))
+  
+  
\ No newline at end of file
diff --git a/operators/cloudnative-pg/0.0.1/app-readme.md b/operators/cloudnative-pg/0.0.2/app-readme.md
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/app-readme.md
rename to operators/cloudnative-pg/0.0.2/app-readme.md
diff --git a/operators/cloudnative-pg/0.0.2/charts/common-12.12.3.tgz b/operators/cloudnative-pg/0.0.2/charts/common-12.12.3.tgz
new file mode 100644
index 00000000000..98f348579a7
Binary files /dev/null and b/operators/cloudnative-pg/0.0.2/charts/common-12.12.3.tgz differ
diff --git a/operators/cloudnative-pg/0.0.1/ix_values.yaml b/operators/cloudnative-pg/0.0.2/ix_values.yaml
similarity index 99%
rename from operators/cloudnative-pg/0.0.1/ix_values.yaml
rename to operators/cloudnative-pg/0.0.2/ix_values.yaml
index 191b74f091a..d80b3605e6c 100644
--- a/operators/cloudnative-pg/0.0.1/ix_values.yaml
+++ b/operators/cloudnative-pg/0.0.2/ix_values.yaml
@@ -13,18 +13,20 @@ workload:
             - --leader-elect
             - --config-map-name={{ include "tc.v1.common.lib.chart.names.fullname" $ }}-config
             - --secret-name={{ include "tc.v1.common.lib.chart.names.fullname" $ }}-config
-            - --webhook-port={{ $.Values.service.main.ports.main.targetPort }}
+            - --webhook-port=9443
           command:
             - /manager
           probes:
             liveness:
-              port: main
+              port: webhook
+              type: https
               path: /readyz
             readiness:
-              port: main
+              port: webhook
+              type: https
               path: /readyz
             startup:
-              port: main
+              port: webhook
               type: tcp
           env:
             OPERATOR_IMAGE_NAME: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -40,16 +42,17 @@ service:
   main:
     ports:
       main:
+        protocol: http
+        port: 8080
+  cnpg-webhook-service:
+    enabled: true
+    expandObjectName: false
+    ports:
+      webhook:
+        enabled: true
         protocol: https
         port: 443
         targetPort: 9443
-  metrics:
-    enabled: true
-    ports:
-      metrics:
-        enabled: true
-        protocol: http
-        port: 8080
 
 operator:
   register: true
@@ -81,7 +84,7 @@ metrics:
     enabled: false
     type: "podmonitor"
     endpoints:
-      - port: metrics
+      - port: main
         interval: 5s
         scrapeTimeout: 5s
         path: /
diff --git a/operators/cloudnative-pg/0.0.1/questions.yaml b/operators/cloudnative-pg/0.0.2/questions.yaml
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/questions.yaml
rename to operators/cloudnative-pg/0.0.2/questions.yaml
diff --git a/operators/cloudnative-pg/0.0.1/templates/NOTES.txt b/operators/cloudnative-pg/0.0.2/templates/NOTES.txt
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/templates/NOTES.txt
rename to operators/cloudnative-pg/0.0.2/templates/NOTES.txt
diff --git a/operators/cloudnative-pg/0.0.1/templates/_mutatingwebhookconfiguration.tpl b/operators/cloudnative-pg/0.0.2/templates/_mutatingwebhookconfiguration.tpl
similarity index 92%
rename from operators/cloudnative-pg/0.0.1/templates/_mutatingwebhookconfiguration.tpl
rename to operators/cloudnative-pg/0.0.2/templates/_mutatingwebhookconfiguration.tpl
index e77dbb4a5fd..54d022d1f31 100644
--- a/operators/cloudnative-pg/0.0.1/templates/_mutatingwebhookconfiguration.tpl
+++ b/operators/cloudnative-pg/0.0.2/templates/_mutatingwebhookconfiguration.tpl
@@ -22,7 +22,7 @@ webhooks:
   - v1
   clientConfig:
     service:
-      name: {{ include "tc.v1.common.lib.chart.names.fullname" $ }}
+      name: cnpg-webhook-service
       namespace: {{ .Release.Namespace }}
       path: /mutate-postgresql-cnpg-io-v1-backup
       port: {{ .Values.service.main.ports.main.port }}
@@ -43,7 +43,7 @@ webhooks:
   - v1
   clientConfig:
     service:
-      name: {{ include "tc.v1.common.lib.chart.names.fullname" $ }}
+      name: cnpg-webhook-service
       namespace: {{ .Release.Namespace }}
       path: /mutate-postgresql-cnpg-io-v1-cluster
       port: {{ .Values.service.main.ports.main.port }}
@@ -64,7 +64,7 @@ webhooks:
   - v1
   clientConfig:
     service:
-      name: {{ include "tc.v1.common.lib.chart.names.fullname" $ }}
+      name: cnpg-webhook-service
       namespace: {{ .Release.Namespace }}
       path: /mutate-postgresql-cnpg-io-v1-scheduledbackup
       port: {{ .Values.service.main.ports.main.port }}
diff --git a/operators/cloudnative-pg/0.0.1/templates/_validatingwebhookconfiguration.tpl b/operators/cloudnative-pg/0.0.2/templates/_validatingwebhookconfiguration.tpl
similarity index 91%
rename from operators/cloudnative-pg/0.0.1/templates/_validatingwebhookconfiguration.tpl
rename to operators/cloudnative-pg/0.0.2/templates/_validatingwebhookconfiguration.tpl
index 35d35d75665..a240caa5e05 100644
--- a/operators/cloudnative-pg/0.0.1/templates/_validatingwebhookconfiguration.tpl
+++ b/operators/cloudnative-pg/0.0.2/templates/_validatingwebhookconfiguration.tpl
@@ -22,7 +22,7 @@ webhooks:
   - v1
   clientConfig:
     service:
-      name: {{ include "tc.v1.common.lib.chart.names.fullname" $ }}
+      name: cnpg-webhook-service
       namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-backup
       port: {{ .Values.service.main.ports.main.port }}
@@ -43,7 +43,7 @@ webhooks:
   - v1
   clientConfig:
     service:
-      name: {{ include "tc.v1.common.lib.chart.names.fullname" $ }}
+      name: cnpg-webhook-service
       namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-cluster
       port: {{ .Values.service.main.ports.main.port }}
@@ -64,7 +64,7 @@ webhooks:
   - v1
   clientConfig:
     service:
-      name: {{ include "tc.v1.common.lib.chart.names.fullname" $ }}
+      name: cnpg-webhook-service
       namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-scheduledbackup
       port: {{ .Values.service.main.ports.main.port }}
@@ -85,7 +85,7 @@ webhooks:
     - v1
   clientConfig:
     service:
-      name: {{ include "tc.v1.common.lib.chart.names.fullname" $ }}
+      name: cnpg-webhook-service
       namespace: {{ .Release.Namespace }}
       path: /validate-postgresql-cnpg-io-v1-pooler
       port: {{ .Values.service.main.ports.main.port }}
diff --git a/operators/cloudnative-pg/0.0.1/templates/common.yaml b/operators/cloudnative-pg/0.0.2/templates/common.yaml
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/templates/common.yaml
rename to operators/cloudnative-pg/0.0.2/templates/common.yaml
diff --git a/operators/cloudnative-pg/0.0.1/templates/crds.yaml b/operators/cloudnative-pg/0.0.2/templates/crds.yaml
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/templates/crds.yaml
rename to operators/cloudnative-pg/0.0.2/templates/crds.yaml
diff --git a/operators/cloudnative-pg/0.0.1/values.yaml b/operators/cloudnative-pg/0.0.2/values.yaml
similarity index 100%
rename from operators/cloudnative-pg/0.0.1/values.yaml
rename to operators/cloudnative-pg/0.0.2/values.yaml