diff --git a/manifests/inspector.pp b/manifests/inspector.pp
index 03019ac4..fe5e93af 100644
--- a/manifests/inspector.pp
+++ b/manifests/inspector.pp
@@ -329,18 +329,6 @@
 #   (optional) Whether to run ironic-inspector as a standalone service.
 #   Defaults to true
 #
-# DEPRECATED PARAMETERS
-#
-# [*rabbit_heartbeat_in_pthread*]
-#   (Optional) EXPERIMENTAL: Run the health check heartbeat thread
-#   through a native python thread. By default if this
-#   option isn't provided the  health check heartbeat will
-#   inherit the execution model from the parent process. By
-#   example if the parent process have monkey patched the
-#   stdlib by using eventlet/greenlet then the heartbeat
-#   will be run through a green thread.
-#   Defaults to undef
-#
 class ironic::inspector (
   $package_ensure                                       = 'present',
   Boolean $manage_service                               = true,
@@ -406,8 +394,6 @@ class ironic::inspector (
   $amqp_durable_queues                                  = $facts['os_service_default'],
   $amqp_auto_delete                                     = $facts['os_service_default'],
   Boolean $standalone                                   = true,
-  # DEPRECATED PARAMETERS
-  $rabbit_heartbeat_in_pthread                          = undef,
 ) inherits ironic::params {
   include ironic::deps
   include ironic::pxe::common
@@ -529,7 +515,6 @@ class ironic::inspector (
     rabbit_use_ssl                  => $rabbit_use_ssl,
     heartbeat_timeout_threshold     => $rabbit_heartbeat_timeout_threshold,
     heartbeat_rate                  => $rabbit_heartbeat_rate,
-    heartbeat_in_pthread            => $rabbit_heartbeat_in_pthread,
     rabbit_qos_prefetch_count       => $rabbit_qos_prefetch_count,
     kombu_reconnect_delay           => $kombu_reconnect_delay,
     kombu_failover_strategy         => $kombu_failover_strategy,
diff --git a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-18210130d6563fe9.yaml b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-18210130d6563fe9.yaml
index eababe1f..a52b3553 100644
--- a/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-18210130d6563fe9.yaml
+++ b/releasenotes/notes/remove-rabbit_heartbeat_in_pthread-18210130d6563fe9.yaml
@@ -1,4 +1,5 @@
 ---
 upgrade:
   - |
-    The ``ironic::rabbit_heartbeat_in_pthread`` parameter has been removed.
+    The ``ironic::rabbit_heartbeat_in_pthread`` parameter and
+    the ``ironic::inspector::rabbit_heartbeat_in_pthread`` have been removed.
diff --git a/spec/classes/ironic_inspector_spec.rb b/spec/classes/ironic_inspector_spec.rb
index 8609b4b6..eeb3e463 100644
--- a/spec/classes/ironic_inspector_spec.rb
+++ b/spec/classes/ironic_inspector_spec.rb
@@ -136,7 +136,6 @@ describe 'ironic::inspector' do
         :rabbit_use_ssl                  => '<SERVICE DEFAULT>',
         :heartbeat_timeout_threshold     => '<SERVICE DEFAULT>',
         :heartbeat_rate                  => '<SERVICE DEFAULT>',
-        :heartbeat_in_pthread            => nil,
         :rabbit_qos_prefetch_count       => '<SERVICE DEFAULT>',
         :kombu_reconnect_delay           => '<SERVICE DEFAULT>',
         :kombu_failover_strategy         => '<SERVICE DEFAULT>',
@@ -255,7 +254,6 @@ describe 'ironic::inspector' do
           :rabbit_use_ssl                     => true,
           :rabbit_heartbeat_timeout_threshold => '60',
           :rabbit_heartbeat_rate              => '10',
-          :rabbit_heartbeat_in_pthread        => true,
           :rabbit_qos_prefetch_count          => 0,
           :kombu_reconnect_delay              => '5.0',
           :amqp_durable_queues                => true,
@@ -296,7 +294,6 @@ describe 'ironic::inspector' do
           :rabbit_use_ssl                  => true,
           :heartbeat_timeout_threshold     => '60',
           :heartbeat_rate                  => '10',
-          :heartbeat_in_pthread            => true,
           :rabbit_qos_prefetch_count       => 0,
           :kombu_reconnect_delay           => '5.0',
           :amqp_durable_queues             => true,