diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index f1496cb75c7780a6706fd1aec40fe26359edad48..f2c6afb6dae2483fa3c98a8a23dfd583c0a0028e 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.4.11
+version: 0.4.12
 
 appVersion: "3.9.13"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 7c586d81b978b625fb8eea370620c8a73e8f9a1c..97f51102d1ff5ee6c7e956b68ec8159e31c4ec88 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-![Version: 0.4.11](https://img.shields.io/badge/Version-0.4.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.13](https://img.shields.io/badge/AppVersion-3.9.13-informational?style=flat-square)
+![Version: 0.4.12](https://img.shields.io/badge/Version-0.4.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.13](https://img.shields.io/badge/AppVersion-3.9.13-informational?style=flat-square)
 
 ## Changelog
 
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index b404024898825270b6fdc7e54c4f67ab35e4ce9f..c4d24a8333ee98aa5ed99f867cb3a1a270a4ee0a 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -8,4 +8,5 @@
 | 0.4.9 | 3.9.13 | Fixed startupProbe |
 | 0.4.10 | 3.9.13 | Implemented support for extra secrets and advanced configuration capabilites |
 | 0.4.11 | 3.9.13 | Corrected chart documentation |
+| 0.4.12 | 3.9.13 | Fixed headless service and enabled publishNotReadyAddresses |
 | | | |
diff --git a/charts/rabbitmq/templates/service-internal.yaml b/charts/rabbitmq/templates/service-internal.yaml
index a781946cb33f24ea53d28215a8fe51e48744995e..94053c4106275128a643d62194ea6383b665de38 100644
--- a/charts/rabbitmq/templates/service-internal.yaml
+++ b/charts/rabbitmq/templates/service-internal.yaml
@@ -6,6 +6,7 @@ metadata:
     {{- include "rabbitmq.labels" . | nindent 4 }}
 spec:
   clusterIP: None
+  publishNotReadyAddresses: true
   ports:
     - port: {{ .Values.service.amqp.port }}
       targetPort: amqp