diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml
index 726796339..a7ece265e 100644
--- a/roles/network/tasks/NM-debian.yml
+++ b/roles/network/tasks/NM-debian.yml
@@ -16,6 +16,17 @@
   template:
     dest: /etc/NetworkManager/system-connections/
     src: network/bridge-br0
+    mode: 0600
+
+- name: Stop wpa_supplicant service
+  service:
+    name: wpa_supplicant
+    state: stopped
+  when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance"
+
+- name: Mask wpa_supplicant
+  shell: systemctl mask wpa_supplicant
+  when: iiab_wireless_lan_iface is defined and hostapd_enabled and iiab_network_mode != "Appliance"
 
 - name: Reload systemd
   shell: systemctl daemon-reload
diff --git a/roles/network/templates/dhcp/dhcpd.service b/roles/network/templates/dhcp/dhcpd.service
index 3a6fc6d26..5313bfa7e 100644
--- a/roles/network/templates/dhcp/dhcpd.service
+++ b/roles/network/templates/dhcp/dhcpd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=DHCPv4 Server Daemon
-After=syslog.target network.target
+After=network-online.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/dhcpd
diff --git a/roles/network/templates/hostapd/hostapd.service.j2 b/roles/network/templates/hostapd/hostapd.service.j2
index cd5f33ac3..0a7b9c22d 100644
--- a/roles/network/templates/hostapd/hostapd.service.j2
+++ b/roles/network/templates/hostapd/hostapd.service.j2
@@ -1,6 +1,6 @@
 [Unit]
 Description=Hostapd IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
-After=network.target
+After=rc-local.service
 
 [Service]
 Type=idle