diff --git a/roles/platform/tasks/initialize_teardown_azure.yml b/roles/platform/tasks/initialize_teardown_azure.yml
index 310122fd..68d52fc1 100644
--- a/roles/platform/tasks/initialize_teardown_azure.yml
+++ b/roles/platform/tasks/initialize_teardown_azure.yml
@@ -40,5 +40,5 @@
       - "{{ plat__azure_datalakeadmin_identity_name }}"
       - "{{ plat__azure_log_identity_name }}"
       - "{{ plat__azure_ranger_audit_identity_name }}"
-    role_assignment_assignee_list: "{{ msi_principal_id_list | union([plat__azure_application_service_principal_objuuid]) | list }}"
+    role_assignment_assignee_list: "{{ msi_principal_id_list | union([plat__azure_application_service_principal_objuuid | default([])]) | list }}"
     
\ No newline at end of file
diff --git a/roles/platform/tasks/teardown_azure_authz.yml b/roles/platform/tasks/teardown_azure_authz.yml
index 5f52c28f..9c0174ff 100644
--- a/roles/platform/tasks/teardown_azure_authz.yml
+++ b/roles/platform/tasks/teardown_azure_authz.yml
@@ -39,8 +39,6 @@
     api_version: '2018-11-30'
     idempotency: yes
     state: absent
-    body:
-      location: "{{ plat__region }}"
   loop:
     - "{{ plat__azure_idbroker_identity_name }}"
     - "{{ plat__azure_datalakeadmin_identity_name }}"
@@ -60,10 +58,10 @@
   delay: 5
   retries: 10
   until:
-    - plat__azure_idbroker_identity_name in discovered_msi_list
-    - plat__azure_datalakeadmin_identity_name in discovered_msi_list
-    - plat__azure_log_identity_name in discovered_msi_list
-    - plat__azure_ranger_audit_identity_name in discovered_msi_list
+    - plat__azure_idbroker_identity_name not in discovered_msi_list
+    - plat__azure_datalakeadmin_identity_name not in discovered_msi_list
+    - plat__azure_log_identity_name not in discovered_msi_list
+    - plat__azure_ranger_audit_identity_name not in discovered_msi_list
   vars:
     discovered_msi_list: "{{ __azure_identity_list.response | map(attribute='name') | list }}"