diff --git a/tripleo_ansible/playbooks/cli-overcloud-delete.yaml b/tripleo_ansible/playbooks/cli-overcloud-delete.yaml
index 710813394..c19495c00 100644
--- a/tripleo_ansible/playbooks/cli-overcloud-delete.yaml
+++ b/tripleo_ansible/playbooks/cli-overcloud-delete.yaml
@@ -45,22 +45,15 @@
     - name: Delete OVN MAC Address ports
       tripleo_ovn_mac_addresses:
         stack_name: "{{ stack_name }}"
-    - name: Heat block
-      block:
-        - name: Delete heat stack
-          openstack.cloud.stack:
-            name: "{{ stack_name }}"
-            state: absent
-          register: stack_delete
-          until: stack_delete is success
-          delay: 5
-          retries: 3
-      rescue:
-        - name: Notice
-          debug:
-            msg: >-
-              The Heat stack for "{{ stack_name }}" was not deleted,
-              depending on the deployment type this may be normal.
+    - name: Delete heat stack
+      openstack.cloud.stack:
+        name: "{{ stack_name }}"
+        state: absent
+      register: stack_delete
+      until: stack_delete is success
+      delay: 4
+      retries: 16
+      when: heat_stack_delete|default(false)
     - name: Remove the config download stack
       file:
         path: "{{ config_download_path }}/{{ stack_name }}"