diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index cae091a0080cc19e28ca80eba700de0f9987af92..87fbc7689e8292a8f0614a69d87e26b650d48b40 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: "0.7.8"
+version: "0.6.30"
 
-appVersion: "3.12.8"
+appVersion: "3.11.25"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 6cfb384faf522003121b29a81fdc985128499fdc..236eb9ffc5dcead46e56e1596aa60e61fca6b870 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -76,6 +76,8 @@ helm uninstall my-release
 | initResources | object | `{}` | Resource limits and requests for the default init container |
 | resources | object | `{}` | Resource limits and requests |
 | nodeSelector | object | `{}` | Deployment node selector |
+| statefulsetLabels | object | `{}` | Additional StatefulSet labels |
+| statefulsetAnnotations | object | `{}` | Additional StatefulSet annotations |
 | podAnnotations | object | `{}` | Additional pod annotations |
 | podSecurityContext | object | `see values.yaml` | Pod security context |
 | securityContext | object | `see values.yaml` | Container security context |
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index 7ba3e2fa19086339ea006c14d1ad21eaaa627ed5..2d120d521bfa37dddbf3f07ff007157808bfe847 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -90,6 +90,7 @@
 | 0.6.27 | 3.11.23 | Upgraded to RabbitMQ 3.11.23 |
 | 0.6.28 | 3.11.24 | Upgraded to RabbitMQ 3.11.24 |
 | 0.6.29 | 3.11.25 | Upgraded to RabbitMQ 3.11.25 |
+| 0.6.30 | 3.11.25 | Upgraded to RabbitMQ 3.11.25 |
 | 0.7.0 | 3.12.0 | Upgraded to RabbitMQ 3.12.0 |
 | 0.7.1 | 3.12.1 | Upgraded to RabbitMQ 3.12.1 |
 | 0.7.2 | 3.12.2 | Upgraded to RabbitMQ 3.12.2 |
diff --git a/charts/rabbitmq/templates/statefulset.yaml b/charts/rabbitmq/templates/statefulset.yaml
index a1e49be3ef769c148146f12f6e575a7186d45808..cf25bf23d343248214df400f8264c1f4adf91f14 100644
--- a/charts/rabbitmq/templates/statefulset.yaml
+++ b/charts/rabbitmq/templates/statefulset.yaml
@@ -4,6 +4,13 @@ metadata:
   name: {{ include "rabbitmq.fullname" . }}
   labels:
     {{- include "rabbitmq.labels" . | nindent 4 }}
+    {{- with .Values.statefulsetLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.statefulsetAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     matchLabels:
diff --git a/charts/rabbitmq/values.yaml b/charts/rabbitmq/values.yaml
index d9fe53fc6bb86d6ff6b7017d567f6287d335a573..85759ac3f15f2e8977447558c0a5044ecfc01835 100644
--- a/charts/rabbitmq/values.yaml
+++ b/charts/rabbitmq/values.yaml
@@ -23,6 +23,12 @@ fullnameOverride: ""
 ## Number of replicas
 replicaCount: 1
 
+## Additional statefulset labels
+statefulsetLabels: {}
+
+## Additional statefulset annotations
+statefulsetAnnotations: {}
+
 ## Additional pod annotations
 podAnnotations: {}