diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 9dddef8cb..f17e60910 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -48,5 +48,5 @@ kolla_image_tags:
   ovn:
     rocky-9: 2023.1-rocky-9-20240809T102431
   rabbitmq:
-    rocky-9: 2023.1-rocky-9-20240823T101942
+    rocky-9: 2023.1-rocky-9-20240925T133913
     ubuntu-jammy: 2023.1-ubuntu-jammy-20240823T101942
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index e2fbad5cc..b6cc34475 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -289,6 +289,7 @@ kolla_build_blocks:
     {% for repo in base_centos_repo_overrides_post_yum_list %}
         sed -i -e '/\[{{ repo.tag }}\]/,/^\[/ s/^\(mirrorlist *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(baseurl *=.*\)/#\1/g' \
+               -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[ \t]*\(https.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
     {% endfor %}
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 50985a30a..bd766b98c 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -11,8 +11,8 @@ stackhpc_pulp_repo_epel_9_version: 20240708T235303
 stackhpc_pulp_repo_grafana_version: 20240708T235303
 stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
-stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343
-stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
+stackhpc_pulp_repo_rabbitmq_erlang_version: 20240925T093206
+stackhpc_pulp_repo_rabbitmq_server_version: 20240925T111913
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
 stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
 stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511
diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml
index 9606634a9..db9e3bda5 100644
--- a/etc/kayobe/stackhpc.yml
+++ b/etc/kayobe/stackhpc.yml
@@ -57,11 +57,11 @@ stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/
 stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
 
 # RabbitMQ - Erlang for Redhat family, version 8/9 agnostic
-stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
+stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
 
 # RabbitMQ for Redhat family, version 8/9 agnostic
-stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/8/x86_64/{{ stackhpc_repo_rabbitmq_server_version }}"
+stackhpc_repo_rabbitmq_server_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/rabbitmq-server/el/9/noarch/{{ stackhpc_repo_rabbitmq_server_version }}"
 stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 - NFV OpenvSwitch
diff --git a/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml b/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml
new file mode 100644
index 000000000..b1a66e16f
--- /dev/null
+++ b/releasenotes/notes/rabbitmq-cloudsmith-repos-78ba8e4958e0a3ee.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    RabbitMQ and Erlang packages are now all installed from the Cloudsmith
+    ``rabbitmq.com`` mirrors since the RabbitMQ ``packagecloud.io`` is getting
+    shut down August 18st, 2024:
+    https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024