diff --git a/roles/network/tasks/detected_network.yml b/roles/network/tasks/detected_network.yml
index aaaf06a7e..ba104f5d6 100644
--- a/roles/network/tasks/detected_network.yml
+++ b/roles/network/tasks/detected_network.yml
@@ -255,6 +255,11 @@
   register: current_client_channel
   when: wifi_up_down and can_be_ap and has_wifi_gateway is defined
 
+- name: Forcing wifi_up_down to False based on firmware selection "24"
+  set_fact:
+    wifi_up_down: False
+  when: rpi3bplus_rpi4_wifi_firmware == "24"
+
 - name: In VM disable LAN - needs local_vars entry to activate
   set_fact:
     iiab_lan_iface: none
@@ -313,6 +318,10 @@
       value: "{{ can_be_ap }}"
     - option: host_country_code_found
       value: "{{ host_country_code }}"
+    - option: wifi_firmware_43430
+      value: "{{ rpizerow_rpi3_wifi_firmware }}"
+    - option: wifi_firmware_43455
+      value: "{{ rpi3bplus_rpi4_wifi_firmware }}"
 
 - name: Add 'detected_network' variable 'current_client_channel_found' value if defined, to {{ iiab_ini_file }}
   ini_file:
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index 7e2f1eabb..bb05482f5 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -1,8 +1,3 @@
-- name: Select RPi firmware mode
-  include_role:
-    name: firmware
-  when: rpi_model != "none"
-
 - name: detected_network
   include_tasks: detected_network.yml
 
@@ -108,6 +103,11 @@
   # end block
   when: network_installed is defined and network_enabled
 
+- name: Select RPi firmware mode
+  include_role:
+    name: firmware
+  when: rpi_model != "none"
+
 
 - name: Create {{ iiab_etc_path }}/install-flags/iiab-network-complete on second pass of network role.
   file: