diff --git a/roles/network/tasks/NM-debian.yml b/roles/network/tasks/NM-debian.yml
index d5dad9ffc..200911a91 100644
--- a/roles/network/tasks/NM-debian.yml
+++ b/roles/network/tasks/NM-debian.yml
@@ -71,8 +71,9 @@
   when: wan_ip != "dhcp"
 
 - name: Use systemd-networkd to handle br0
-  include_tasks: sysd-netd-debian.yml
-  when: iiab_lan_iface == "br0" and not systemd_networkd_active
+  set_fact:
+    systemd_networkd_active: True
+  when: iiab_lan_iface == "br0"
 
 - name: Reload systemd
   systemd:
diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 1576a2af3..0e1ccd980 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -14,6 +14,16 @@
     - wpa_supplicant
   when: wifi_up_down and hostapd_enabled
 
+- name: Record host_country_code_applied in network of iiab_ini_file
+  ini_file:
+    dest: "{{ iiab_ini_file }}"    # /etc/iiab/iiab.ini
+    section: network
+    option: "{{ item.option }}"
+    value: "{{ item.value | string }}"
+  with_items:
+    - option: host_country_code_applied
+      value: "{{ host_country_code }}"
+
 - name: Create /etc/hostapd/hostapd.conf and backup .iiab from template if needed
   template:
     owner: root
@@ -26,6 +36,14 @@
     - { src: 'hostapd/hostapd.conf.j2', dest: '/etc/hostapd/hostapd.conf.iiab' }
   when: can_be_ap
 
+- name: Enable & Restart networkd-dispatcher.service
+  systemd:
+    name: networkd-dispatcher
+    state: restarted
+    enabled: yes
+    masked: no
+  when: systemd_networkd_active
+
 - name: Restart hostapd when WiFi is present but not when using WiFi as gateway with wifi_up_down False
   systemd:
     name: hostapd
diff --git a/roles/network/tasks/sysd-netd-debian.yml b/roles/network/tasks/sysd-netd-debian.yml
index f1b860d85..e1b73db61 100644
--- a/roles/network/tasks/sysd-netd-debian.yml
+++ b/roles/network/tasks/sysd-netd-debian.yml
@@ -87,6 +87,17 @@
   systemd:
     daemon_reload: yes
 
+- name: Detect WiFi country code in use
+  shell: iw reg get | grep country | grep -v UNSET | awk '{print $2}' | sed "s|:||"
+  register: REG_DOM
+  ignore_errors: True
+  when: discovered_wireless_iface != "none"
+
+- name: Set Wifi Region country code for hostapd when present
+  set_fact:
+    host_country_code: "{{ REG_DOM.stdout }}"
+  when: REG_DOM is defined and REG_DOM.stdout | length > 0
+
 - name: Clone wifi if needed
   systemd:
     name: iiab-clone-wifi
@@ -107,9 +118,3 @@
     enabled: yes
     masked: no
 
-- name: Enable & Restart networkd-dispatcher.service
-  systemd:
-    name: networkd-dispatcher
-    state: restarted
-    enabled: yes
-    masked: no
diff --git a/roles/network/templates/hostapd/iiab-hotspot-off b/roles/network/templates/hostapd/iiab-hotspot-off
index eb5951c6b..98fb9dbf2 100755
--- a/roles/network/templates/hostapd/iiab-hotspot-off
+++ b/roles/network/templates/hostapd/iiab-hotspot-off
@@ -38,6 +38,8 @@ fi
 echo -e "\nPlease reboot to enable upstream WiFi access.\n"
 exit 0
 {% endif %}
+#is_raspbian
+{% endif %}
 #wifi_up_down
 {% endif %}
-{% endif %}
+#network_enabled
diff --git a/roles/network/templates/hostapd/iiab-hotspot-on b/roles/network/templates/hostapd/iiab-hotspot-on
index 04d551774..3f809bf44 100755
--- a/roles/network/templates/hostapd/iiab-hotspot-on
+++ b/roles/network/templates/hostapd/iiab-hotspot-on
@@ -46,7 +46,10 @@ systemctl enable hostapd
 echo -e "\nPlease reboot to activate hostapd feature.\n"
 exit 0
 {% endif %}
+#is_raspbian
+{% endif %}
 #wifi_up_down
 {% endif %}
+#can_be_ap
 {% endif %}
-{% endif %}
+#network_enabled
diff --git a/roles/network/templates/hostapd/iiab-test-wifi.j2 b/roles/network/templates/hostapd/iiab-test-wifi.j2
index 6757846d3..205f77fc7 100755
--- a/roles/network/templates/hostapd/iiab-test-wifi.j2
+++ b/roles/network/templates/hostapd/iiab-test-wifi.j2
@@ -29,9 +29,19 @@ fi
 if [ -f /run/netplan/wpa-$IFACE.conf ]; then
     NETPLAN=1
     SSID=`grep ssid /run/netplan/wpa-$IFACE.conf | awk -F = '{print $2}' | sed -r s/\"// | sed -r s/\"//`
-    echo "cover netplan lack of country="
-    sed -i 's|ctrl_interface=/run/wpa_supplicant|&\ncountry=US|' /run/netplan/wpa-$IFACE.conf
+    REG_DOM=$(grep country /run/netplan/wpa-$IFACE.conf | awk -F = '{ print $2 }')
+    if [ -z "$REG_DOM" ]; then
+        echo "cover netplan wifi client lack of country="
+        sed -i "s|ctrl_interface=/run/wpa_supplicant|&\ncountry={{ host_country_code }}|" /run/netplan/wpa-$IFACE.conf
+    else
+        echo "set hostapd wifi country to $REG_DOM"
+        if [ -f /etc/hostapd/hostapd.conf.iiab ]; then
+            sed -i "s|^country.*|country_code=$REG_DOM|" /etc/hostapd/hostapd.conf.iiab
+            cp /etc/hostapd/hostapd.conf.iiab /etc/hostapd/hostapd.conf
+        fi
+    fi
 fi
+
 # IIAB hint for NetworkManager
 # could scrape /etc/NetworkManager/system-connections/ looking for ssid
 if [ -f /etc/iiab/iiab.env ]; then
diff --git a/roles/network/templates/hostapd/netd-disp2 b/roles/network/templates/hostapd/netd-disp2
index 78e258627..e6a8fca72 100644
--- a/roles/network/templates/hostapd/netd-disp2
+++ b/roles/network/templates/hostapd/netd-disp2
@@ -13,6 +13,9 @@ if [ "$IFACE" == "{{ discovered_wireless_iface }}" ]; then
         systemctl stop wpa_supplicant
         systemctl restart hostapd
         systemctl start wpa_supplicant
+        if [ -f /run/netplan/wpa-$IFACE.conf ]; then
+            systemctl restart netplan-wpa-$IFACE.service
+        fi
     else
         echo "Upstream Channel greater than 13 or is the same - not changing hostapd.conf"
     fi