diff --git a/roles/runtime/tasks/initialize_teardown.yml b/roles/runtime/tasks/initialize_teardown.yml
index 16120d5a..60f81f5f 100644
--- a/roles/runtime/tasks/initialize_teardown.yml
+++ b/roles/runtime/tasks/initialize_teardown.yml
@@ -28,7 +28,7 @@
   when: run__include_df
   cloudera.cloud.df_service_info:
     name: "{{ run__env_name }}"
-  register: run__df_env_info
+  register: run__df_service_info
 
 - name: Discover CDP Data Warehouse cluster
   cloudera.cloud.dw_cluster_info:
diff --git a/roles/runtime/tasks/teardown_base.yml b/roles/runtime/tasks/teardown_base.yml
index 8db64385..d0fcb9cc 100644
--- a/roles/runtime/tasks/teardown_base.yml
+++ b/roles/runtime/tasks/teardown_base.yml
@@ -114,10 +114,10 @@
 - name: Execute CDP Dataflow teardown
   when:
     - run__include_df or run__force_teardown | bool
-    - run__df_env_info is defined and run__df_env_info.services is defined
-    - run__df_env_info.services | length > 0
+    - run__df_service_info is defined and run__df_service_info.services is defined
+    - run__df_service_info.services | length > 0
   cloudera.cloud.df_service:
-    name: "{{ __df_teardown_req_item.crn }}"
+    df_crn: "{{ __df_teardown_req_item.crn }}"
     persist: "{{ run__df_persist }}"
     force: "{{ run__df_force_delete }}"
     terminate: "{{ run__df_terminate_deployments }}"
@@ -125,7 +125,7 @@
     wait: no
   loop_control:
     loop_var: __df_teardown_req_item
-  loop: "{{ run__df_env_info.services }}"
+  loop: "{{ run__df_service_info.services }}"
   register: __df_teardown_info
 
 - name: Execute CDP ML Workspace teardown
@@ -273,9 +273,9 @@
 - name: Wait for CDP Dataflow Service to decommission
   when:
     - run__include_df
-    - run__df_env_info.services | length > 0
+    - run__df_service_info.services | length > 0
   cloudera.cloud.df_service:
-    name: "{{ __df_teardown_wait_item.crn }}"
+    df_crn: "{{ __df_teardown_wait_item.crn }}"
     persist: "{{ run__df_persist }}"
     force: "{{ run__df_force_delete }}"
     terminate: "{{ run__df_terminate_deployments }}"