diff --git a/doc/source/operations/upgrading-openstack.rst b/doc/source/operations/upgrading-openstack.rst
index d52828ad7..d7ab463d5 100644
--- a/doc/source/operations/upgrading-openstack.rst
+++ b/doc/source/operations/upgrading-openstack.rst
@@ -79,7 +79,7 @@ After queue migration is finished, upgrade RabbitMQ to 4.1 by running the follow
 
 .. code-block:: bash
 
-   kayobe kolla ansible run rabbitmq-upgrade 4.1
+   kayobe kolla ansible run "rabbitmq-upgrade 4.1"
 
 .. note::
 
diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml
index 883fd9e6d..796567309 100644
--- a/etc/kayobe/kolla-image-tags.yml
+++ b/etc/kayobe/kolla-image-tags.yml
@@ -6,3 +6,6 @@ kolla_image_tags:
   openstack:
     rocky-9: 2025.1-rocky-9-20250728T150626
     ubuntu-noble: 2025.1-ubuntu-noble-20250725T143116
+  rabbitmq:
+    rocky-9: 2025.1-rocky-9-20250723T092136
+    ubuntu-noble: 2025.1-ubuntu-noble-20250723T092136
diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index 85778eaac..8f4aae658 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -58,3 +58,5 @@ prometheus_blackbox_exporter_endpoints_kayobe:
     enabled: "{{ seed_pulp_container_enabled | bool }}"
 
 prometheus_openstack_exporter_interval: "{{ stackhpc_prometheus_openstack_exporter_interval }}s"
+
+rabbitmq_image: "{% raw %}{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/rabbitmq-4-1{% endraw %}"
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 1b3f17254..5cfa9e489 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -28,13 +28,11 @@ stackhpc_pulp_repo_opensearch_2_x_version: 20250430T014638
 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20250430T014638
 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20250718T004955
 stackhpc_pulp_repo_rhel9_rabbitmq_erlang_aarch64_version: 20250721T162732
-stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250607T003941
+stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20250708T003546
 stackhpc_pulp_repo_rhel_9_influxdb_version: 20250529T023704
 stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20250529T041909
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250523T014203
 stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20250523T035924
-stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318
-stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318
 stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20250516T002449
 stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20250516T024051
 stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml
index 77e2f21c9..3d2f027ae 100644
--- a/etc/kayobe/pulp.yml
+++ b/etc/kayobe/pulp.yml
@@ -564,6 +564,7 @@ stackhpc_pulp_images_kolla:
   - prometheus-server
   - proxysql
   - rabbitmq
+  - rabbitmq-4-1
   - redis
   - redis-sentinel
 
diff --git a/releasenotes/notes/caracal-to-epoxy-upgrade-support-9f8896fa1fd230bc.yaml b/releasenotes/notes/caracal-to-epoxy-upgrade-support-9f8896fa1fd230bc.yaml
new file mode 100644
index 000000000..438e74cf3
--- /dev/null
+++ b/releasenotes/notes/caracal-to-epoxy-upgrade-support-9f8896fa1fd230bc.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Support OpenStack upgrade from 2024.1 to 2025.1.
+  - |
+    Added RabbitMQ 4.1 support.
+    StackHPC Kayobe Config now deploys RabbitMQ 4.1 by default.