diff --git a/roles/communishift/tasks/cleanup-administration-tasks.yml b/roles/communishift/tasks/cleanup-administration-tasks.yml
index fd24f4f715..4cb827e85f 100644
--- a/roles/communishift/tasks/cleanup-administration-tasks.yml
+++ b/roles/communishift/tasks/cleanup-administration-tasks.yml
@@ -1,4 +1,4 @@
 ---
-- include_tasks: retrieve-communishift-admin-data.yml
+#- include_tasks: retrieve-communishift-admin-data.yml
 - include_tasks: send-tenant-deletion-notifications.yml
 - include_tasks: start-tenant-project-cleanup.yml
diff --git a/roles/communishift/tasks/start-tenant-project-cleanup.yml b/roles/communishift/tasks/start-tenant-project-cleanup.yml
index 281659585e..3591728c52 100644
--- a/roles/communishift/tasks/start-tenant-project-cleanup.yml
+++ b/roles/communishift/tasks/start-tenant-project-cleanup.yml
@@ -2,6 +2,6 @@
 - name: "Offboard the Communishift tenant project"
   debug:
     msg: "delete task for project: {{ item.value.name }}"
-  when: "{{ not item.value.do_not_delete | bool }}"
+  when: "not should_not_delete"
   tags:
     - communishift_cluster_cleanup