diff --git a/bitnami/cloudnative-pg/CHANGELOG.md b/bitnami/cloudnative-pg/CHANGELOG.md
index 022ea7db03f5bf..f7e5fcec55e0c1 100644
--- a/bitnami/cloudnative-pg/CHANGELOG.md
+++ b/bitnami/cloudnative-pg/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Changelog
 
-## 0.1.7 (2025-04-01)
+## 0.1.8 (2025-04-22)
 
-* [bitnami/cloudnative-pg] Release 0.1.7 ([#32723](https://github.com/bitnami/charts/pull/32723))
+* [bitnami/cloudnative-pg] fix use Values failed in range method ([#33101](https://github.com/bitnami/charts/pull/33101))
+
+## <small>0.1.7 (2025-04-01)</small>
+
+* [bitnami/*] Add tanzuCategory annotation (#32409) ([a8fba5c](https://github.com/bitnami/charts/commit/a8fba5cb01f6f4464ca7f69c50b0fbe97d837a95)), closes [#32409](https://github.com/bitnami/charts/issues/32409)
+* [bitnami/cloudnative-pg] Release 0.1.7 (#32723) ([5c9af25](https://github.com/bitnami/charts/commit/5c9af25502d10851181a6285e2fc3678892336f5)), closes [#32723](https://github.com/bitnami/charts/issues/32723)
 
 ## <small>0.1.6 (2025-03-05)</small>
 
diff --git a/bitnami/cloudnative-pg/Chart.yaml b/bitnami/cloudnative-pg/Chart.yaml
index a77010a0ba3a89..4829913a805fa0 100644
--- a/bitnami/cloudnative-pg/Chart.yaml
+++ b/bitnami/cloudnative-pg/Chart.yaml
@@ -31,4 +31,4 @@ maintainers:
 name: cloudnative-pg
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/cloudnative-pg
-version: 0.1.7
+version: 0.1.8
diff --git a/bitnami/cloudnative-pg/templates/role.yaml b/bitnami/cloudnative-pg/templates/role.yaml
index 8b7600db208d38..24362b404f2e5c 100644
--- a/bitnami/cloudnative-pg/templates/role.yaml
+++ b/bitnami/cloudnative-pg/templates/role.yaml
@@ -12,7 +12,7 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" $ }}
 metadata:
   name: {{ include "common.names.fullname" $ | trunc 63 | trimSuffix "-" }}
   namespace: {{ $namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" $.Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: cloudnative-pg
     app.kubernetes.io/component: operator
   {{- if $.Values.commonAnnotations }}
diff --git a/bitnami/cloudnative-pg/templates/rolebinding.yaml b/bitnami/cloudnative-pg/templates/rolebinding.yaml
index c6ea874b5cf673..c69ed9884adb2c 100644
--- a/bitnami/cloudnative-pg/templates/rolebinding.yaml
+++ b/bitnami/cloudnative-pg/templates/rolebinding.yaml
@@ -12,7 +12,7 @@ apiVersion: {{ include "common.capabilities.rbac.apiVersion" $ }}
 metadata:
   name: {{ include "common.names.fullname" $ | trunc 63 | trimSuffix "-" }}
   namespace: {{ $namespace | quote }}
-  labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
+  labels: {{- include "common.labels.standard" ( dict "customLabels" $.Values.commonLabels "context" $ ) | nindent 4 }}
     app.kubernetes.io/part-of: cloudnative-pg
     app.kubernetes.io/component: operator
   {{- if $.Values.commonAnnotations }}