diff --git a/lmn-client.yml b/lmn-client.yml
index d785cf8..a072ea2 100644
--- a/lmn-client.yml
+++ b/lmn-client.yml
@@ -349,12 +349,11 @@
     admin_email: "{{ vault_admin_email }}"
 
   roles:
-    - role: lmn_wlan_iwd
-      when: ansible_interfaces | select('search', 'wl.+') | first is defined
     - role: lmn_localuser
       when: "'teacherlaptop' not in group_names"
     - role: lmn_wlan
     - role: lmn_wlan_8021x
+      when: ansible_interfaces | select('search', 'wl.+') | first is defined
       tags:
         - never
         - wlan_8021x
@@ -370,3 +369,27 @@
         - /etc/systemd/network/virbr1.network
         - /etc/systemd/network/wlan-dhcp.network
         - /etc/NetworkManager/system-connections/FVS-devices.nmconnection
+
+    - name: Enable wpa-supplicant
+      ansible.builtin.systemd:
+        name: wpa_supplicant.service
+        enabled: True
+      tags:
+        - never
+        - wlan_8021x
+
+    - name: Disable iwd
+      ansible.builtin.systemd:
+        name: iwd.service
+        enabled: False
+      tags:
+        - never
+        - wlan_8021x
+
+    - name: Remove deprecated NetworkManager config
+      blockinfile:
+        path: /etc/NetworkManager/NetworkManager.conf
+        state: absent
+      tags:
+        - never
+        - wlan_8021x