diff --git a/roles/netconfig/tasks/main.yml b/roles/netconfig/tasks/main.yml
index c789eac..e80f5a9 100644
--- a/roles/netconfig/tasks/main.yml
+++ b/roles/netconfig/tasks/main.yml
@@ -52,10 +52,9 @@
     command: section
     config: wireless
     type: wifi-iface
-    find:
-      ifname: "{{ item.ifname | default(wifi_iface[item.template].ifname) | default('') }}"
+    name: "{{ item.ifname | default(wifi_iface[item.template].ifname) | default('') }}"
     value:
-      ifname: "{{ item.ifname | default(wifi_iface[item.template].ifname) | default('') }}"
+      ifname: "{{ item.ifname | default(wifi_iface[item.template].ifname) | default('') if not item.force_ifnameless | default(false) }}"
       mode: "{{ item.mode | default(wifi_iface[item.template].mode) }}"
       device: "{{ item.device | default(wifi_iface[item.template].device) }}"
       network: "{{ item.network | default(wifi_iface[item.template].network) }}"