diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index 6f5f7ce1d..cdd73cc98 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -1,19 +1,19 @@
 - name: iiab_wan_device
   shell: grep IIAB_WAN_DEVICE /etc/iiab/iiab.env | awk -F "=" '{print $2}'
-  when: not first_run
+  when: iiab_stage|int > 4
   register: prior_gw
 
 - name: Checking for old device gateway interface for device test
   set_fact:
-    device_gw: "{{ prior_gw.stdout }}"
-    device_gw2: "{{ prior_gw.stdout }}"
-  when: not first_run and prior_gw is defined and prior_gw.stdout != ""
+      device_gw: "{{ prior_gw.stdout }}"
+      device_gw2: "{{ prior_gw.stdout }}"
+  when: iiab_stage|int > 4 and prior_gw is defined and prior_gw.stdout != ""
 
 - name: Setting WAN if detected
   set_fact:
-    iiab_wan_iface: "{{ discovered_wan_iface }}"
-    device_gw: "{{ discovered_wan_iface }}"
-  when: discovered_wan_iface != "none"
+      iiab_wan_iface: "{{ discovered_wan_iface }}"
+      device_gw: "{{ discovered_wan_iface }}"
+  when: ansible_default_ipv4.gateway is defined
 
 - name: RedHat network detection
   include_tasks: detected_redhat.yml