diff --git a/bitnami/spring-cloud-dataflow/Chart.yaml b/bitnami/spring-cloud-dataflow/Chart.yaml
index b21c1c1d0c..2378fea62c 100644
--- a/bitnami/spring-cloud-dataflow/Chart.yaml
+++ b/bitnami/spring-cloud-dataflow/Chart.yaml
@@ -39,4 +39,4 @@ sources:
   - https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow
   - https://github.com/bitnami/bitnami-docker-spring-cloud-skipper
   - https://dataflow.spring.io/
-version: 12.0.0
+version: 12.0.1
diff --git a/bitnami/spring-cloud-dataflow/templates/_helpers.tpl b/bitnami/spring-cloud-dataflow/templates/_helpers.tpl
index d7386056f3..9b297fe81a 100644
--- a/bitnami/spring-cloud-dataflow/templates/_helpers.tpl
+++ b/bitnami/spring-cloud-dataflow/templates/_helpers.tpl
@@ -276,7 +276,7 @@ Return the RabbitMQ Port
 */}}
 {{- define "scdf.rabbitmq.port" -}}
 {{- if .Values.rabbitmq.enabled }}
-    {{- printf "%d" (.Values.rabbitmq.service.port | int ) -}}
+    {{- printf "%d" (.Values.rabbitmq.service.ports.amqp | int ) -}}
 {{- else -}}
     {{- printf "%d" (.Values.externalRabbitmq.port | int ) -}}
 {{- end -}}