diff --git a/deployment/mistral/mistral-base.yaml b/deployment/mistral/mistral-base.yaml
index deb76e1a17..bc24500a2c 100644
--- a/deployment/mistral/mistral-base.yaml
+++ b/deployment/mistral/mistral-base.yaml
@@ -71,38 +71,6 @@ parameters:
         Messaging client subscriber parameter to specify
         an SSL connection to the messaging host.
     type: string
-  MistralMaxMissedHeartbeats:
-    type: number
-    default: 15
-    description: >
-        The maximum amount of missed heartbeats to be allowed.
-        If set to 0 then this feature is disabled. See check_interval for more
-        details.
-    constraints:
-      - range: { min: 0 }
-  MistralCheckInterval:
-    type: number
-    default: 20
-    description: >
-        How often (in seconds) action executions are checked.
-        For example when check_interval is 10, check action
-        executions every 10 seconds. When the checker runs it will
-        transit all running action executions to error if the last
-        heartbeat received is older than 10 * max_missed_heartbeats
-        seconds. If set to 0 then this feature is disabled.
-    constraints:
-      - range: { min: 0 }
-  MistralFirstHeartbeatTimeout:
-    type: number
-    default: 3600
-    description: >
-        The first heartbeat is handled differently, to provide a
-        grace period in case there is no available executor to handle
-        the action execution. For example when
-        first_heartbeat_timeout = 3600, wait 3600 seconds before
-        closing the action executions that never received a heartbeat.
-    constraints:
-      - range: { min: 0 }
 
 parameter_groups:
 - label: deprecated
@@ -143,9 +111,6 @@ outputs:
           - {get_param: Debug }
           - {get_param: MistralDebug }
         mistral::rpc_response_timeout: 120
-        mistral::max_missed_heartbeats: {get_param: MistralMaxMissedHeartbeats}
-        mistral::check_interval: {get_param: MistralCheckInterval}
-        mistral::first_heartbeat_timeout: {get_param: MistralFirstHeartbeatTimeout}
         mistral::keystone::authtoken::project_name: 'service'
         mistral::keystone::authtoken::user_domain_name: 'Default'
         mistral::keystone::authtoken::project_domain_name: 'Default'
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index bfd96911ac..18737aab23 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -140,10 +140,6 @@ parameter_defaults:
   MistralExecutionFieldSizeLimit: 16384
   MistralExecutorVolumes:
     - /var/lib/config-data/nova/etc/nova:/etc/nova:ro
-  #  https://bugs.launchpad.net/tripleo/+bug/1821611
-  MistralMaxMissedHeartbeats: 30
-  MistralCheckInterval: 40
-  MistralFirstHeartBeatTimeout: 7200
   NeutronServicePlugins: router,segments
   NeutronMechanismDrivers: ['openvswitch', 'baremetal']
   NeutronNetworkVLANRanges: 'physnet1:1000:2999'
diff --git a/releasenotes/notes/mistral_timeout-c00344d5b3d8c4b0.yaml b/releasenotes/notes/mistral_timeout-c00344d5b3d8c4b0.yaml
deleted file mode 100644
index 6703ff1974..0000000000
--- a/releasenotes/notes/mistral_timeout-c00344d5b3d8c4b0.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-fixes:
-  - |
-    Allow to configure Mistral parameters for Heartbeat and set sane defaults
-    for the Undercloud so we can deploy an Overcloud in Stein.
-    Fixes `bug 1821611 <https://bugs.launchpad.net/tripleo/+bug/1821611>`__.