diff --git a/charmhelpers/contrib/openstack/context.py b/charmhelpers/contrib/openstack/context.py
index b67dafda8..425d1d59f 100644
--- a/charmhelpers/contrib/openstack/context.py
+++ b/charmhelpers/contrib/openstack/context.py
@@ -768,6 +768,8 @@ def __call__(self):
         if send_notifications_to_logs:
             ctxt['send_notifications_to_logs'] = send_notifications_to_logs
 
+        ctxt['rabbit_heartbeat_timeout_threshold'] = conf.get('rabbit_heartbeat_timeout_threshold')
+
         if not self.complete:
             return {}
 
diff --git a/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit b/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit
index bed2216ab..603810ba0 100644
--- a/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit
+++ b/charmhelpers/contrib/openstack/templates/section-oslo-messaging-rabbit
@@ -8,3 +8,6 @@ ssl = True
 {% if rabbit_ssl_ca -%}
 ssl_ca_file = {{ rabbit_ssl_ca }}
 {% endif -%}
+{% if rabbit_heartbeat_timeout_threshold -%}
+heartbeat_timeout_threshold = {{ rabbit_heartbeat_timeout_threshold }}
+{% endif -%}