diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index e1a7151ee..1cad936ec 100644
--- a/rabbitmq/Chart.yaml
+++ b/rabbitmq/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v3.9.0
 description: OpenStack-Helm RabbitMQ
 name: rabbitmq
-version: 0.1.32
+version: 0.1.33
 home: https://github.com/rabbitmq/rabbitmq-server
 ...
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index e427b2654..9db515909 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -33,11 +33,11 @@ labels:
 images:
   tags:
     prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v1.0.0-RC7.1
-    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    rabbitmq_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    rabbitmq: docker.io/library/rabbitmq:3.9.0
+    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:2023.2-ubuntu_jammy
+    rabbitmq_init: docker.io/openstackhelm/heat:2023.2-ubuntu_jammy
+    rabbitmq: docker.io/library/rabbitmq:3.13.0
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    scripted_test: docker.io/library/rabbitmq:3.9.0-management
+    scripted_test: docker.io/library/rabbitmq:3.13.0-management
     image_repo_sync: docker.io/library/docker:17.07.0
   pull_policy: "IfNotPresent"
   local_registry:
diff --git a/rabbitmq/values_overrides/2023.1-ubuntu_focal.yaml b/rabbitmq/values_overrides/2023.1-ubuntu_focal.yaml
new file mode 100644
index 000000000..2a17e4f2d
--- /dev/null
+++ b/rabbitmq/values_overrides/2023.1-ubuntu_focal.yaml
@@ -0,0 +1,18 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+images:
+  tags:
+    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:2023.1-ubuntu_focal
+    rabbitmq_init: docker.io/openstackhelm/heat:2023.1-ubuntu_focal
+...
diff --git a/rabbitmq/values_overrides/2023.1-ubuntu_jammy.yaml b/rabbitmq/values_overrides/2023.1-ubuntu_jammy.yaml
new file mode 100644
index 000000000..b3bd64cb4
--- /dev/null
+++ b/rabbitmq/values_overrides/2023.1-ubuntu_jammy.yaml
@@ -0,0 +1,18 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+images:
+  tags:
+    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
+    rabbitmq_init: docker.io/openstackhelm/heat:2023.1-ubuntu_jammy
+...
diff --git a/rabbitmq/values_overrides/2023.2-ubuntu_jammy.yaml b/rabbitmq/values_overrides/2023.2-ubuntu_jammy.yaml
new file mode 100644
index 000000000..1b07b9bf4
--- /dev/null
+++ b/rabbitmq/values_overrides/2023.2-ubuntu_jammy.yaml
@@ -0,0 +1,18 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+images:
+  tags:
+    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:2023.2-ubuntu_jammy
+    rabbitmq_init: docker.io/openstackhelm/heat:2023.2-ubuntu_jammy
+...
diff --git a/rabbitmq/values_overrides/yoga-ubuntu_focal.yaml b/rabbitmq/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 000000000..4f29dc4b6
--- /dev/null
+++ b/rabbitmq/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,18 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+images:
+  tags:
+    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:yoga-ubuntu_focal
+    rabbitmq_init: docker.io/openstackhelm/heat:yoga-ubuntu_focal
+...
diff --git a/rabbitmq/values_overrides/zed-ubuntu_focal.yaml b/rabbitmq/values_overrides/zed-ubuntu_focal.yaml
new file mode 100644
index 000000000..907d962a0
--- /dev/null
+++ b/rabbitmq/values_overrides/zed-ubuntu_focal.yaml
@@ -0,0 +1,18 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+images:
+  tags:
+    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:zed-ubuntu_focal
+    rabbitmq_init: docker.io/openstackhelm/heat:zed-ubuntu_focal
+...
diff --git a/rabbitmq/values_overrides/zed-ubuntu_jammy.yaml b/rabbitmq/values_overrides/zed-ubuntu_jammy.yaml
new file mode 100644
index 000000000..bdc21d64e
--- /dev/null
+++ b/rabbitmq/values_overrides/zed-ubuntu_jammy.yaml
@@ -0,0 +1,18 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+images:
+  tags:
+    prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:zed-ubuntu_jammy
+    rabbitmq_init: docker.io/openstackhelm/heat:zed-ubuntu_jammy
+...
diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml
index 468556e19..17791513e 100644
--- a/releasenotes/notes/rabbitmq.yaml
+++ b/releasenotes/notes/rabbitmq.yaml
@@ -32,4 +32,5 @@ rabbitmq:
   - 0.1.30 Add labels to rabbitmq service
   - 0.1.31 Support management api metrics collection
   - 0.1.32 Enable addition of default consumer prefetch count
+  - 0.1.33 Bump RabbitMQ image version to 3.13.0
 ...
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 8b62e4e43..909936e3e 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -315,16 +315,27 @@
     parent: openstack-helm-compute-kit-2023-2-ubuntu_jammy
     files:
       - ^roles/deploy-env.*
+      - ^rabbitmq/.*
+      - ^mariadb/.*
+      - ^openvswitch/.*
+      - ^roles/deploy-env.*
 
 - job:
     name: openstack-helm-infra-cinder-2023-2-ubuntu_jammy
     parent: openstack-helm-cinder-2023-2-ubuntu_jammy
     files:
       - ^roles/deploy-env.*
+      - ^rabbitmq/.*
+      - ^mariadb/.*
+      - ^roles/deploy-env.*
 
 - job:
     name: openstack-helm-infra-tls-2023-1-ubuntu_focal
     parent: openstack-helm-tls-2023-1-ubuntu_focal
     files:
       - ^roles/deploy-env.*
+      - ^rabbitmq/.*
+      - ^mariadb/.*
+      - ^openvswitch/.*
+      - ^roles/deploy-env.*
 ...