diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml
index d4d3947144..5e38857422 100644
--- a/deployment/aodh/aodh-base.yaml
+++ b/deployment/aodh/aodh-base.yaml
@@ -88,6 +88,7 @@ outputs:
           - true
           - {get_param: Debug}
         aodh::notification_driver: {get_param: NotificationDriver}
+        aodh::rabbit_heartbeat_in_pthread: false
         aodh::service_credentials::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
         aodh::service_credentials::password: {get_param: AodhPassword}
         aodh::service_credentials::region_name: {get_param: KeystoneRegion}
diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml
index 4ca5c0b7f9..1e1fb30edb 100644
--- a/deployment/barbican/barbican-api-container-puppet.yaml
+++ b/deployment/barbican/barbican-api-container-puppet.yaml
@@ -271,6 +271,7 @@ outputs:
               - true
               - {get_param: Debug}
             barbican::api::notification_driver: {get_param: NotificationDriver}
+            barbican::api::rabbit_heartbeat_in_pthread: false
             barbican::api::service_name: 'httpd'
             barbican::wsgi::apache::bind_host:
               str_replace:
diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
index 757d8e83f7..4b7146291c 100644
--- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
@@ -113,6 +113,7 @@ outputs:
             ceilometer::snmpd_readonly_username: {get_param: SnmpdReadonlyUserName}
             ceilometer::snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
             ceilometer::host: "%{hiera('fqdn_canonical')}"
+            ceilometer::rabbit_heartbeat_in_pthread: false
       service_config_settings:
         keystone:
           # Enable default notification queue
diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml
index b407496d7e..236b496266 100644
--- a/deployment/cinder/cinder-base.yaml
+++ b/deployment/cinder/cinder-base.yaml
@@ -137,6 +137,7 @@ outputs:
         cinder::storage_availability_zone: {get_param: CinderStorageAvailabilityZone}
         cinder::rabbit_heartbeat_timeout_threshold: 60
         cinder::rpc_response_timeout: {get_param: CinderRpcResponseTimeout}
+        cinder::rabbit_heartbeat_in_pthread: false
         cinder::db::database_db_max_retries: -1
         cinder::db::database_max_retries: -1
         cinder::cron::db_purge::minute: {get_param: CinderCronDbPurgeMinute}
diff --git a/deployment/designate/designate-base.yaml b/deployment/designate/designate-base.yaml
index 7daa3de938..cdb6783517 100644
--- a/deployment/designate/designate-base.yaml
+++ b/deployment/designate/designate-base.yaml
@@ -86,13 +86,14 @@ outputs:
   role_data:
     description: Base role data for Designate services
     value:
-       service_name: designate_base
-       config_settings:
-         designate::logging::debug:
-          if:
-          - {get_param: DesignateDebug}
-          - true
-          - {get_param: Debug }
-         designate::purge_config: {get_param: EnableConfigPurge}
-         designate::notification_driver: {get_param: NotificationDriver}
-         designate_enable_neutron_integration: {get_param: DesignateEnableNeutronIntegration}
+      service_name: designate_base
+      config_settings:
+        designate::logging::debug:
+         if:
+         - {get_param: DesignateDebug}
+         - true
+         - {get_param: Debug }
+        designate::purge_config: {get_param: EnableConfigPurge}
+        designate::notification_driver: {get_param: NotificationDriver}
+        designate::rabbit_heartbeat_in_pthread: false
+        designate_enable_neutron_integration: {get_param: DesignateEnableNeutronIntegration}
diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml
index 9ff17d2111..19bf41b148 100644
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@@ -579,6 +579,7 @@ outputs:
             tripleo::profile::base::glance::api::multistore_config: {get_param: GlanceMultistoreConfig}
             tripleo::profile::base::glance::backend::rbd::glance_rbd_ceph_conf_path: {get_param: CephConfigPath}
             glance::notify::rabbitmq::notification_driver: {get_param: NotificationDriver}
+            glance::notify::rabbitmq::rabbit_heartbeat_in_pthread: false
             glance::cron::db_purge::minute: {get_param: GlanceCronDbPurgeMinute}
             glance::cron::db_purge::hour: {get_param: GlanceCronDbPurgeHour}
             glance::cron::db_purge::monthday: {get_param: GlanceCronDbPurgeMonthday}
diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml
index 7e62a563eb..4f8464aa93 100644
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@@ -183,6 +183,7 @@ outputs:
             heat::enable_proxy_headers_parsing: true
             heat::rpc_response_timeout: 600
             heat::rabbit_heartbeat_timeout_threshold: 60
+            heat::rabbit_heartbeat_in_pthread: false
             heat::region_name: {get_param: KeystoneRegion}
             heat::keystone::authtoken::project_name: 'service'
             heat::keystone::authtoken::user_domain_name: 'Default'
diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml
index 0e410f07f9..5075815612 100644
--- a/deployment/ironic/ironic-base-puppet.yaml
+++ b/deployment/ironic/ironic-base-puppet.yaml
@@ -98,5 +98,6 @@ outputs:
           if:
           - rpc_transport_set
           - {get_param: IronicRpcTransport}
+        ironic::rabbit_heartbeat_in_pthread: false
       step_config: |
         include tripleo::profile::base::ironic
diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml
index 224d384619..10f24bab0f 100644
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@@ -515,6 +515,7 @@ outputs:
             keystone::cron::trust_flush::destination: {get_param: KeystoneCronTrustFlushDestination}
             keystone::cron::trust_flush::user: {get_param: KeystoneCronTrustFlushUser}
             keystone::rabbit_heartbeat_timeout_threshold: 60
+            keystone::rabbit_heartbeat_in_pthread: false
             keystone::service_name: 'httpd'
             keystone::enable_ssl: {get_param: EnableInternalTLS}
             keystone::wsgi::apache::api_port:
diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml
index 8a453aab97..e51cbf6f2b 100644
--- a/deployment/manila/manila-base.yaml
+++ b/deployment/manila/manila-base.yaml
@@ -93,6 +93,7 @@ outputs:
         # Currently the address family parameters are mutually exclusive
         manila::network::neutron::network_plugin_ipv4_enabled:
           if: [{get_param: ManilaIPv6}, false, true]
+        manila::rabbit_heartbeat_in_pthread: false
       service_config_settings:
         mysql:
           manila::db::mysql::password: {get_param: ManilaPassword}
diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml
index a0845bacdb..5fa742a58c 100644
--- a/deployment/neutron/neutron-base.yaml
+++ b/deployment/neutron/neutron-base.yaml
@@ -149,6 +149,7 @@ outputs:
               - {get_param: NeutronGlobalPhysnetMtu}
             neutron::db::sync::extra_params: {get_param: NeutronDBSyncExtraParams}
             neutron::vlan_transparent: {get_param: EnableVLANTransparency}
+            neutron::rabbit_heartbeat_in_pthread: false
           - if:
             - dhcp_agents_zero
             - {}
diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml
index f78a8ba8df..bfb2657104 100644
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@@ -199,6 +199,7 @@ outputs:
             - tls_cache_enabled
             - 'dogpile.cache.pymemcache'
             - 'dogpile.cache.memcached'
+          nova::rabbit_heartbeat_in_pthread: false
           nova::upgrade_level_compute:
             if:
             - compute_upgrade_level_set
diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml
index a25d1cf35d..2c55a37b55 100644
--- a/deployment/octavia/octavia-base.yaml
+++ b/deployment/octavia/octavia-base.yaml
@@ -293,6 +293,7 @@ outputs:
                 - {get_param: OctaviaUserLogFormat}
             octavia::controller::disable_local_log_storage: {get_param: OctaviaDisableLocalLogStorage}
             octavia::nova::enable_anti_affinity: {get_param: OctaviaAntiAffinity}
+            octavia::rabbit_heartbeat_in_pthread: false
           -
             if:
             - octavia_topology_unset
diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
index cf7da5be06..f7faffc1ee 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -198,6 +198,7 @@ outputs:
               swift::proxy::ceilometer::region_name: {get_param: KeystoneRegion}
               swift::proxy::ceilometer::ignore_projects: {get_param: SwiftCeilometerIgnoreProjects}
               swift::proxy::ceilometer::nonblocking_notify: true
+              swift::proxy::ceilometer::rabbit_heartbeat_in_pthread: false
             - {}
           - swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]}
             tripleo::profile::base::swift::proxy::ceilometer_enabled: {get_param: SwiftCeilometerPipelineEnabled}
diff --git a/releasenotes/notes/rabbit_heartbeat_in_pthread-bc71d5dcd4e3a99d.yaml b/releasenotes/notes/rabbit_heartbeat_in_pthread-bc71d5dcd4e3a99d.yaml
new file mode 100644
index 0000000000..36c2eb0346
--- /dev/null
+++ b/releasenotes/notes/rabbit_heartbeat_in_pthread-bc71d5dcd4e3a99d.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    The ``[oslo_messaging_rabbit] heartbeat_in_pthread`` parameter is set to
+    ``False`` to workaround some known issues with non-wsgi services like
+    nova-compute. In case the parameter should be overridden, use
+    ``ExtraConfig`` or ``<role>ExtraConfig``.