diff --git a/roles/config_drive/tasks/main.yml b/roles/config_drive/tasks/main.yml
index e41c89ba16..a103959be5 100644
--- a/roles/config_drive/tasks/main.yml
+++ b/roles/config_drive/tasks/main.yml
@@ -51,8 +51,7 @@
 - name: Generate user-data
   register: _user_data_change
   when:
-    - cifmw_config_drive_userdata is not none
-    - cifmw_config_drive_userdata | length > 0
+    - cifmw_config_drive_userdata | default({}) | length > 0
   ansible.builtin.template:
     backup: true
     src: "user-data.j2"
@@ -61,9 +60,7 @@
 
 - name: Generate network-data
   register: _net_data_change
-  when:
-    - cifmw_config_drive_networkconfig is not none
-    - cifmw_config_drive_networkconfig | length > 0
+  when: cifmw_config_drive_networkconfig | default({}) | length > 0
   ansible.builtin.template:
     backup: true
     src: "network-config.j2"