diff --git a/lmn-client.yml b/lmn-client.yml
index 5d99e38..d785cf8 100644
--- a/lmn-client.yml
+++ b/lmn-client.yml
@@ -353,6 +353,7 @@
       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
       tags:
         - never
diff --git a/roles/lmn_wlan/tasks/main.yml b/roles/lmn_wlan/tasks/main.yml
new file mode 100644
index 0000000..de93ff1
--- /dev/null
+++ b/roles/lmn_wlan/tasks/main.yml
@@ -0,0 +1,30 @@
+---
+- name: Install packages related to wifi
+  ansible.builtin.apt:
+    name:
+      - systemd-resolved
+      - firmware-realtek # for our wifi sticks
+
+- name: Provide service to enable WiFi on boot
+  ansible.builtin.copy:
+    dest: /etc/systemd/system/enable-wifi.service
+    mode: '0644'
+    content: |
+      [Unit]
+      Description=Switch WiFi on
+      After=NetworkManager.service
+
+      [Service]
+      Type=oneshot
+      ExecStart=/usr/bin/nmcli radio wifi on
+
+      [Install]
+      WantedBy=multi-user.target
+  when: "'teacherlaptop' not in group_names"
+
+- name: Enable the enable-wifi service
+  ansible.builtin.systemd:
+    name: enable-wifi.service
+    enabled: true
+    daemon_reload: true
+  when: "'teacherlaptop' not in group_names"