diff --git a/stable/rabbitmq/Chart.yaml b/stable/rabbitmq/Chart.yaml
index 7354c33e56..6fe8619eb0 100644
--- a/stable/rabbitmq/Chart.yaml
+++ b/stable/rabbitmq/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: rabbitmq
-version: 6.7.0
+version: 6.7.1
 appVersion: 3.7.17
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/stable/rabbitmq/templates/svc.yaml b/stable/rabbitmq/templates/svc.yaml
index 236f604afd..ae3f0867f2 100644
--- a/stable/rabbitmq/templates/svc.yaml
+++ b/stable/rabbitmq/templates/svc.yaml
@@ -28,10 +28,15 @@ spec:
   - name: epmd
     port: 4369
     targetPort: epmd
+    {{- if (eq .Values.service.type "ClusterIP") }}
+    nodePort: null
+    {{- end }}
   - name: amqp
     port: {{ .Values.service.port }}
     targetPort: amqp
-    {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
+    {{- if (eq .Values.service.type "ClusterIP") }}
+    nodePort: null
+    {{- else if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
     nodePort: {{ .Values.service.nodePort }}
     {{- end }}
   {{- if .Values.rabbitmq.tls.enabled }}
@@ -45,13 +50,22 @@ spec:
   - name: dist
     port: {{ .Values.service.distPort }}
     targetPort: dist
+    {{- if (eq .Values.service.type "ClusterIP") }}
+    nodePort: null
+    {{- end }}
   - name: stats
     port: {{ .Values.service.managerPort }}
     targetPort: stats
+    {{- if (eq .Values.service.type "ClusterIP") }}
+    nodePort: null
+    {{- end }}
 {{- if .Values.metrics.enabled }}
   - name: metrics
     port: {{ .Values.metrics.port }}
     targetPort: 9090
+    {{- if (eq .Values.service.type "ClusterIP") }}
+    nodePort: null
+    {{- end }}
 {{- end }}
   selector:
     app: {{ template "rabbitmq.name" . }}