diff --git a/bitnami/rabbitmq-cluster-operator/CHANGELOG.md b/bitnami/rabbitmq-cluster-operator/CHANGELOG.md
index d6cbd00f7f..788a6fd567 100644
--- a/bitnami/rabbitmq-cluster-operator/CHANGELOG.md
+++ b/bitnami/rabbitmq-cluster-operator/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 4.4.34 (2025-08-21)
+## 4.4.36 (2025-10-29)
 
-* [bitnami/rabbitmq-cluster-operator] :zap: :arrow_up: Update dependency references ([#36162](https://github.com/bitnami/charts/pull/36162))
+* [bitnami/rabbitmq-cluster-operator] Set network policy properly for metrics ([#36270](https://github.com/bitnami/charts/pull/36270))
+
+## <small>4.4.34 (2025-08-21)</small>
+
+* [bitnami/rabbitmq-cluster-operator] :zap: :arrow_up: Update dependency references (#36162) ([a9371f0](https://github.com/bitnami/charts/commit/a9371f09098a7742890b222642885cc7965eeb76)), closes [#36162](https://github.com/bitnami/charts/issues/36162)
 
 ## <small>4.4.33 (2025-08-21)</small>
 
diff --git a/bitnami/rabbitmq-cluster-operator/Chart.yaml b/bitnami/rabbitmq-cluster-operator/Chart.yaml
index 8a128b8055..53f990235e 100644
--- a/bitnami/rabbitmq-cluster-operator/Chart.yaml
+++ b/bitnami/rabbitmq-cluster-operator/Chart.yaml
@@ -38,4 +38,4 @@ maintainers:
 name: rabbitmq-cluster-operator
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq-cluster-operator
-version: 4.4.35
+version: 4.4.36
diff --git a/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/networkpolicy.yaml b/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/networkpolicy.yaml
index 890194f17a..2a68fdce3a 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/networkpolicy.yaml
+++ b/bitnami/rabbitmq-cluster-operator/templates/cluster-operator/networkpolicy.yaml
@@ -60,7 +60,7 @@ spec:
     {{- end }}
   {{- end }}
   ingress:
-    {{- if .Values.clusterOperator.metrics.enabled }}
+    {{- if .Values.clusterOperator.metrics.service.enabled }}
     - ports:
         - port: {{ .Values.clusterOperator.containerPorts.metrics }}
       {{- if not .Values.clusterOperator.networkPolicy.allowExternal }}
diff --git a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/networkpolicy.yaml b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/networkpolicy.yaml
index b228558445..c06874f474 100644
--- a/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/networkpolicy.yaml
+++ b/bitnami/rabbitmq-cluster-operator/templates/messaging-topology-operator/networkpolicy.yaml
@@ -66,7 +66,7 @@ spec:
     - ports:
         {{/* Webhook port is hardcoded in the operator code */}}
         - port: 9443
-        {{- if .Values.msgTopologyOperator.metrics.enabled }}
+        {{- if .Values.msgTopologyOperator.metrics.service.enabled }}
         - port: {{ .Values.msgTopologyOperator.containerPorts.metrics }}
         {{- end }}
       {{- if not .Values.msgTopologyOperator.networkPolicy.allowExternal }}