diff --git a/roles/network/tasks/computed_network.yml b/roles/network/tasks/computed_network.yml
index 15e275d9d..a1eccc5d0 100644
--- a/roles/network/tasks/computed_network.yml
+++ b/roles/network/tasks/computed_network.yml
@@ -135,18 +135,7 @@
 - name: LAN configured - 'Gateway' mode
   set_fact:
     iiab_network_mode: "Gateway"
-  when: is_rpi or (not (iiab_lan_iface == "none") and not (iiab_wan_iface == "none"))
-
-- name: Force iiab_lan_iface if is_rpi
-  set_fact:
-    iiab_lan_iface: "br0"
-    iiab_wireless_lan_iface: "wlan0"
-  when: is_rpi | bool
-
-- name: Enable hostapd if discovered_wireless_iface is not WAN
-  set_fact:
-    hostapd_enabled: True
-  when: is_rpi and not (iiab_wan_iface == discovered_wireless_iface)
+  when: (not (iiab_lan_iface == "none") and not (iiab_wan_iface == "none"))
 
 # override with user_lan_iface setting if no longer in auto
 - name: Setting user LAN fact
diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml
index f3917305b..230de8432 100644
--- a/roles/network/tasks/debian.yml
+++ b/roles/network/tasks/debian.yml
@@ -41,13 +41,13 @@
   template:
     dest: /etc/network/interfaces.d/iiab
     src: network/systemd.j2
-  when: not is_rpi and (iiab_lan_iface == "br0" or wan_ip != "dhcp" or gui_static_wan_ip == "undefined")
+  when: not is_raspbian (iiab_lan_iface == "br0" or wan_ip != "dhcp" or gui_static_wan_ip == "undefined")
 
 - name: Copy the bridge script for RPi
   template:
     dest: /etc/network/interfaces.d/iiab
     src: network/rpi.j2
-  when: is_rpi and iiab_lan_iface == "br0"
+  when: is_raspbian and iiab_lan_iface == "br0"
 
 - name: Workaround auto issue - ifupdown compatibility mode (debian-9+)
   template:
@@ -62,24 +62,7 @@
     regexp: "{{ iiab_wan_iface }}"
   when: wan_ip != "dhcp" and iiab_wan_iface != "none" and is_debian and not is_debian_8
 
-- name: BIND may be affected
-  service:
-    name: "{{ dns_service }}"
-    state: stopped
-  when: named_install and dnsmasq_enabled
-
-# dhcpd_server release the interface
-- name: dhcpd_server may be affected - stopping dhcpd
-  service:
-    name: dhcpd
-    state: stopped
-  when: dhcpd_install | bool
-
-- name: dhcpd_server may be affected - stopping dnsmasq
-  service:
-    name: dnsmasq
-    state: stopped
-  when: dnsmasq_install | bool
+- include_tasks: down-debian.yml
 
 - name: Reload systemd
   systemd:
diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index 6cd163c94..66d4dcbb3 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -141,7 +141,7 @@
 - name: Set iiab_wired_lan_iface if present
   set_fact:
     iiab_wired_lan_iface: "{{ discovered_wired_iface }}"
-  when: discovered_wired_iface is defined and discovered_wired_iface != "none" and discovered_wired_iface != iiab_wan_iface and not is_rpi
+  when: discovered_wired_iface is defined and discovered_wired_iface != "none" and discovered_wired_iface != iiab_wan_iface and not is_raspbian
 
 #unused
 #- name: Get a list of ifcfg files to delete
@@ -151,14 +151,14 @@
 - name: 2 or more devices on the LAN - use bridging
   set_fact:
     iiab_lan_iface: br0
-  when: num_lan_interfaces|int >= 2 and not is_rpi
+  when: num_lan_interfaces|int >= 2
 
-- name: For Debian, always use bridging - except RPi
+- name: For Debian, always use bridging
   set_fact:
     iiab_lan_iface: br0
-  when: num_lan_interfaces|int >= 1 and is_debuntu and not is_rpi
+  when: num_lan_interfaces|int >= 1 and is_debuntu
 
-- name: WiFi is on the LAN - use bridging - except RPi
+- name: WiFi is on the LAN - use bridging
   set_fact:
     iiab_lan_iface: br0
   when: iiab_wireless_lan_iface is defined and not nobridge is defined
diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml
index 76b4602da..b0df14178 100644
--- a/roles/network/tasks/enable_services.yml
+++ b/roles/network/tasks/enable_services.yml
@@ -98,7 +98,6 @@
   when: dnsmasq_install and dnsmasq_enabled and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance")
   #when: dnsmasq_install and dnsmasq_enabled and nd_enabled is defined and nd_enabled.stdout == "enabled" and nd_dir.stat.exists and nd_dir.stat.isdir and (iiab_network_mode != "Appliance")
   #when: dnsmasq_install and dnsmasq_enabled and systemd_out.status.UnitFileState == "enabled" and networkd_dir.stat.exists and networkd_dir.stat.isdir and (iiab_network_mode != "Appliance")
-  #when: dnsmasq_enabled and dnsmasq_install and (iiab_network_mode != "Appliance") and (not is_rpi) and (not is_ubuntu_16)
 
 - name: Remove /etc/dnsmasq.d/iiab.conf, when not dnsmasq_enabled or is Appliance
   file:
diff --git a/roles/network/tasks/hostapd.yml b/roles/network/tasks/hostapd.yml
index 7c14c190f..386eafb92 100644
--- a/roles/network/tasks/hostapd.yml
+++ b/roles/network/tasks/hostapd.yml
@@ -37,7 +37,7 @@
     owner: root
     group: root
     mode: 0755
-  when: is_rpi | bool
+  when: is_raspbian | bool
 
 - name: Create /usr/bin/iiab-hotspot-off from template
   template:
@@ -46,7 +46,7 @@
     owner: root
     group: root
     mode: 0755
-  when: is_rpi | bool
+  when: is_raspbian | bool
 
 - name: Disable the Access Point 'hostapd' service
   systemd:
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 0b79b9acb..b2729314b 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -22,7 +22,7 @@
 #    iiab_wan_iface: "{{ discovered_wired_iface }}"
 #    iiab_wireless_lan_iface: "{{ discovered_wireless_iface }}"
 #    iiab_wired_lan_iface: ""
-#  when: is_rpi and discovered_wireless_iface is defined and discovered_wireless_iface == iiab_wan_iface and reboot_to_AP
+#  when: is_raspbian and discovered_wireless_iface is defined and discovered_wireless_iface == iiab_wan_iface and reboot_to_AP
 
 - include_tasks: computed_network.yml
   when: not installing   #REMOVE THIS LINE IF installing IS ALWAYS false AS SET IN roles/0-init/defaults/main.yml
@@ -33,7 +33,7 @@
 #  set_fact:
 #    no_net_restart: True
 #    hostapd_enabled: False
-#  when: is_rpi and discovered_wireless_iface is defined and discovered_wired_iface != iiab_wan_iface
+#  when: is_raspbian and discovered_wireless_iface is defined and discovered_wired_iface != iiab_wan_iface
 
 ##### Start static ip address info for first run #####
 #- include_tasks: static.yml
@@ -91,12 +91,12 @@
 
 - name: RPi's have dhcpcd in use
   include_tasks: rpi_debian.yml
-  when: is_debuntu and is_rpi
+  when: is_raspbian
   #and not installing
 
 - name: Not RPi, Not NetworkManager, Not systemd-networkd in use
   include_tasks: debian.yml
-  when: (not is_rpi and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16
+  when: (not is_raspbian and not network_manager_active and not systemd_networkd_active and is_debuntu) or is_ubuntu_16
   #and not installing
 
 #### end network layout
diff --git a/roles/network/templates/network/dhcpcd.conf.j2 b/roles/network/templates/network/dhcpcd.conf.j2
index 883218fd1..f1265b10c 100644
--- a/roles/network/templates/network/dhcpcd.conf.j2
+++ b/roles/network/templates/network/dhcpcd.conf.j2
@@ -42,9 +42,9 @@ slaac private
 # Always (try) to run DHCP client on RPi's Ethernet port, for in-field
 # "cablemodems" used by many non-technical operators, who want Zero-Hassle
 # Updates.  This means AVOIDING "denyinterfaces eth0" below:
-{% if is_rpi and hostapd_enabled %}
+{% if is_raspbian and hostapd_enabled %}
 denyinterfaces{% if discovered_wireless_iface != "none" %} {{ discovered_wireless_iface }}{% endif %}
-{% elif is_rpi %}
+{% elif is_raspbian %}
 #denyinterfaces{% if discovered_wireless_iface != "none" %} {{ discovered_wireless_iface }}{% endif %}
 {% else %}
 denyinterfaces{% if iiab_wireless_lan_iface is defined %} {{ iiab_wireless_lan_iface }}{% endif %}{% if iiab_wired_lan_iface is defined %} {{ iiab_wired_lan_iface }}{% endif %}