diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index a034e40bf6..d3f741dd41 100644
--- a/rabbitmq/Chart.yaml
+++ b/rabbitmq/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v3.7.26
 description: OpenStack-Helm RabbitMQ
 name: rabbitmq
-version: 0.1.11
+version: 0.1.12
 home: https://github.com/rabbitmq/rabbitmq-server
 ...
diff --git a/rabbitmq/templates/job-cluster-wait.yaml b/rabbitmq/templates/job-cluster-wait.yaml
index 948fada2e0..b309e6e5f3 100644
--- a/rabbitmq/templates/job-cluster-wait.yaml
+++ b/rabbitmq/templates/job-cluster-wait.yaml
@@ -31,6 +31,11 @@ metadata:
 {{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
   annotations:
     {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
+{{- if .Values.helm3_hook }}
+    "helm.sh/hook": "post-install,post-upgrade"
+    "helm.sh/hook-weight": "5"
+    "helm.sh/hook-delete-policy": before-hook-creation
+{{- end }}
 spec:
   template:
     metadata:
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index 5b4bcee999..988b81c7f9 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -366,6 +366,10 @@ volume:
   class_name: general
   size: 256Mi
 
+# Hook break for helm2.
+# Set helm3_hook to false while using helm2
+helm3_hook: true
+
 manifests:
   certificates: false
   configmap_bin: true
diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml
index ab2fc9e889..b278b7176b 100644
--- a/releasenotes/notes/rabbitmq.yaml
+++ b/releasenotes/notes/rabbitmq.yaml
@@ -11,4 +11,5 @@ rabbitmq:
   - 0.1.9 Use full image ref for docker official images
   - 0.1.10 Set separate for HTTPS
   - 0.1.11 Add TLS support for helm test
+  - 0.1.12 Added helm hook post-install and post-upgrade for rabbitmq wait cluster job
 ...