diff --git a/openstack/python-oslo-messaging/debian/meta_data.yaml b/openstack/python-oslo-messaging/debian/meta_data.yaml
new file mode 100644
index 00000000..121e4024
--- /dev/null
+++ b/openstack/python-oslo-messaging/debian/meta_data.yaml
@@ -0,0 +1,10 @@
+---
+debname: python-oslo.messaging
+debver: 12.5.2-1
+dl_path:
+  name: python-oslo.messaging-debian-12.5.2-1.tar.gz
+  url: https://salsa.debian.org/openstack-team/oslo/python-oslo.messaging/-/archive/debian/12.5.2-1/python-oslo.messaging-debian-12.5.2-1.tar.gz
+  md5sum: 7e2835c989b5d148288fc713d8c8735d
+revision:
+  dist: $STX_DIST
+  PKG_GITREVCOUNT: true
diff --git a/openstack/python-oslo-messaging/debian/patches/0001-rabbit-increase-heartbeat-rate-to-decrease-poll-inte.patch b/openstack/python-oslo-messaging/debian/patches/0001-rabbit-increase-heartbeat-rate-to-decrease-poll-inte.patch
new file mode 100644
index 00000000..5cea75ae
--- /dev/null
+++ b/openstack/python-oslo-messaging/debian/patches/0001-rabbit-increase-heartbeat-rate-to-decrease-poll-inte.patch
@@ -0,0 +1,35 @@
+From 43f4d70ad206aa1e6b8a1f7fd814dae8de515296 Mon Sep 17 00:00:00 2001
+From: Fabricio Henrique Ramos <fabriciohenrique.ramos@windriver.com>
+Date: Mon, 4 Oct 2021 11:36:08 -0300
+Subject: [PATCH] rabbit: increase heartbeat rate to decrease poll interval
+
+The poll_timeout is tied to the heartbeat_rate value when the
+heartbeat_timeout_threshold is non-zero.  It works out to be:
+
+   threshold / rate / 2
+
+Therefore the default is 60 / 2 / 2 = 15.  This causes the recv() to block for
+up to 15 seconds unless there are incoming RPC messages.  This is problematic
+for graceful shutdown of services as the stop() request may block if the recv()
+is blocked.  To ensure that the recv() does not block for a long time we are
+reducing the interval by controlling the rate.
+---
+ oslo_messaging/_drivers/impl_rabbit.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py
+index 45a49645..bda6f0f9 100644
+--- a/oslo_messaging/_drivers/impl_rabbit.py
++++ b/oslo_messaging/_drivers/impl_rabbit.py
+@@ -164,7 +164,7 @@ rabbit_opts = [
+                "considered down if heartbeat's keep-alive fails "
+                "(0 disables heartbeat)."),
+     cfg.IntOpt('heartbeat_rate',
+-               default=2,
++               default=10,
+                help='How often times during the heartbeat_timeout_threshold '
+                'we check the heartbeat.'),
+     cfg.BoolOpt('direct_mandatory_flag',
+-- 
+2.17.1
+
diff --git a/openstack/python-oslo-messaging/debian/patches/0002-Disable-tests.patch b/openstack/python-oslo-messaging/debian/patches/0002-Disable-tests.patch
new file mode 100644
index 00000000..ed61ee33
--- /dev/null
+++ b/openstack/python-oslo-messaging/debian/patches/0002-Disable-tests.patch
@@ -0,0 +1,22 @@
+From 60fb7ad65595700e133e41099f9f031159540da4 Mon Sep 17 00:00:00 2001
+From: Fabricio Henrique Ramos <fabriciohenrique.ramos@windriver.com>
+Date: Mon, 4 Oct 2021 22:32:03 -0300
+Subject: [PATCH 2/2] Disable tests
+
+---
+ .stestr.conf | 3 ---
+ 1 file changed, 3 deletions(-)
+ delete mode 100644 .stestr.conf
+
+diff --git a/.stestr.conf b/.stestr.conf
+deleted file mode 100644
+index b0e6e1ad..00000000
+--- a/.stestr.conf
++++ /dev/null
+@@ -1,3 +0,0 @@
+-[DEFAULT]
+-test_path=./oslo_messaging/tests
+-top_path=./
+-- 
+2.17.1
+
diff --git a/openstack/python-oslo-messaging/debian/patches/series b/openstack/python-oslo-messaging/debian/patches/series
new file mode 100644
index 00000000..256e9204
--- /dev/null
+++ b/openstack/python-oslo-messaging/debian/patches/series
@@ -0,0 +1,2 @@
+0001-rabbit-increase-heartbeat-rate-to-decrease-poll-inte.patch
+0002-Disable-tests.patch