diff --git a/roles/overcloud-delete/tasks/main.yml b/roles/overcloud-delete/tasks/main.yml
index 436c1d905..30e30853e 100644
--- a/roles/overcloud-delete/tasks/main.yml
+++ b/roles/overcloud-delete/tasks/main.yml
@@ -20,10 +20,11 @@
 
     - name: check for delete command to complete or fail
       shell: |
+          source {{ working_dir }}/stackrc
           heat stack-show $(cat {{ working_dir }}/overcloud_id)
       delay: "{{ delete_check_delay }}"
       retries: "{{ delete_check_retries }}"
-      until: "{{ heat_show.stdout.find('DELETE_COMPLETE') }}"
+      until: heat_stack_show.stdout.find('DELETE_COMPLETE') != -1
       register: heat_stack_show
       tags:
         - overcloud-delete