diff --git a/src/board/system76/addw1/board.c b/src/board/system76/addw1/board.c
index 3bbfb8e..d7ed65c 100644
--- a/src/board/system76/addw1/board.c
+++ b/src/board/system76/addw1/board.c
@@ -4,7 +4,6 @@
 #include <board/gpio.h>
 #include <board/kbc.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 
 extern uint8_t main_cycle;
@@ -22,8 +21,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/addw2/board.c b/src/board/system76/addw2/board.c
index 8a5aade..2ba8a0e 100644
--- a/src/board/system76/addw2/board.c
+++ b/src/board/system76/addw2/board.c
@@ -5,7 +5,6 @@
 #include <board/gpio.h>
 #include <board/kbc.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -20,8 +19,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/bonw14/board.c b/src/board/system76/bonw14/board.c
index ae89aa0..ee35dbf 100644
--- a/src/board/system76/bonw14/board.c
+++ b/src/board/system76/bonw14/board.c
@@ -4,7 +4,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -21,8 +20,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/common/power.c b/src/board/system76/common/power.c
index 9bb0149..2a2e4b5 100644
--- a/src/board/system76/common/power.c
+++ b/src/board/system76/common/power.c
@@ -182,6 +182,9 @@ void power_init(void) {
 }
 
 void power_on(void) {
+    // Configure WLAN GPIOs before powering on
+    wireless_power(true);
+
     DEBUG("%02X: power_on\n", main_cycle);
 
     // See Figure 12-19 in Whiskey Lake Platform Design Guide
@@ -258,8 +261,6 @@ void power_on(void) {
 void power_off(void) {
     DEBUG("%02X: power_off\n", main_cycle);
 
-    wireless_power(false);
-
 #if HAVE_PCH_PWROK_EC
     // De-assert SYS_PWROK
     GPIO_SET_DEBUG(PCH_PWROK_EC, false);
@@ -296,6 +297,9 @@ void power_off(void) {
 #endif // HAVE_PCH_DPWROK_EC
     tPCH14;
 
+    // Configure WLAN GPIOs after powering off
+    wireless_power(false);
+
     update_power_state();
 }
 
diff --git a/src/board/system76/darp5/board.c b/src/board/system76/darp5/board.c
index ca0be72..5a73494 100644
--- a/src/board/system76/darp5/board.c
+++ b/src/board/system76/darp5/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 
 void board_init(void) {
     // Allow CPU to boot
@@ -17,8 +16,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {}
diff --git a/src/board/system76/darp7/board.c b/src/board/system76/darp7/board.c
index a03a9d9..f576642 100644
--- a/src/board/system76/darp7/board.c
+++ b/src/board/system76/darp7/board.c
@@ -4,7 +4,6 @@
 #include <board/espi.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -22,8 +21,6 @@ void board_init(void) {
     // Assert SMI# and SWI#
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/darp8/board.c b/src/board/system76/darp8/board.c
index 4846d30..304ca58 100644
--- a/src/board/system76/darp8/board.c
+++ b/src/board/system76/darp8/board.c
@@ -4,7 +4,6 @@
 #include <board/board.h>
 #include <board/espi.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 #include <ec/ec.h>
 
 void board_init(void) {
@@ -22,8 +21,6 @@ void board_init(void) {
     // Assert SMI# and SWI#
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/galp3-c/board.c b/src/board/system76/galp3-c/board.c
index ca0be72..5a73494 100644
--- a/src/board/system76/galp3-c/board.c
+++ b/src/board/system76/galp3-c/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 
 void board_init(void) {
     // Allow CPU to boot
@@ -17,8 +16,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {}
diff --git a/src/board/system76/galp5/board.c b/src/board/system76/galp5/board.c
index c86e86a..574513a 100644
--- a/src/board/system76/galp5/board.c
+++ b/src/board/system76/galp5/board.c
@@ -6,7 +6,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -27,8 +26,6 @@ void board_init(void) {
     // Assert SMI# and SWI#
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/galp6/board.c b/src/board/system76/galp6/board.c
index 8d86aea..6809b7f 100644
--- a/src/board/system76/galp6/board.c
+++ b/src/board/system76/galp6/board.c
@@ -4,7 +4,6 @@
 #include <board/board.h>
 #include <board/espi.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 #include <ec/ec.h>
 
 void board_init(void) {
@@ -18,8 +17,6 @@ void board_init(void) {
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
 
-    wireless_power(true);
-
     // Make sure charger is in off state, also enables PSYS
     battery_charger_disable();
 }
diff --git a/src/board/system76/gaze15/board.c b/src/board/system76/gaze15/board.c
index df2df6d..b0f34be 100644
--- a/src/board/system76/gaze15/board.c
+++ b/src/board/system76/gaze15/board.c
@@ -4,7 +4,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -17,8 +16,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/gaze16-3050/board.c b/src/board/system76/gaze16-3050/board.c
index bfdf948..e793470 100644
--- a/src/board/system76/gaze16-3050/board.c
+++ b/src/board/system76/gaze16-3050/board.c
@@ -6,7 +6,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -20,8 +19,6 @@ void board_init(void) {
     gpio_set(&BKL_EN, true);
     // Enable camera
     gpio_set(&CCD_EN, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/gaze16-3060/board.c b/src/board/system76/gaze16-3060/board.c
index bfdf948..e793470 100644
--- a/src/board/system76/gaze16-3060/board.c
+++ b/src/board/system76/gaze16-3060/board.c
@@ -6,7 +6,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -20,8 +19,6 @@ void board_init(void) {
     gpio_set(&BKL_EN, true);
     // Enable camera
     gpio_set(&CCD_EN, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/gaze17-3050/board.c b/src/board/system76/gaze17-3050/board.c
index bfdf948..e793470 100644
--- a/src/board/system76/gaze17-3050/board.c
+++ b/src/board/system76/gaze17-3050/board.c
@@ -6,7 +6,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -20,8 +19,6 @@ void board_init(void) {
     gpio_set(&BKL_EN, true);
     // Enable camera
     gpio_set(&CCD_EN, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/gaze17-3060/board.c b/src/board/system76/gaze17-3060/board.c
index bfdf948..e793470 100644
--- a/src/board/system76/gaze17-3060/board.c
+++ b/src/board/system76/gaze17-3060/board.c
@@ -6,7 +6,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -20,8 +19,6 @@ void board_init(void) {
     gpio_set(&BKL_EN, true);
     // Enable camera
     gpio_set(&CCD_EN, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/lemp10/board.c b/src/board/system76/lemp10/board.c
index 4e74a8c..85496a3 100644
--- a/src/board/system76/lemp10/board.c
+++ b/src/board/system76/lemp10/board.c
@@ -4,7 +4,6 @@
 #include <board/espi.h>
 #include <board/gctrl.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -23,8 +22,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/lemp11/board.c b/src/board/system76/lemp11/board.c
index d9050f7..b6761d9 100644
--- a/src/board/system76/lemp11/board.c
+++ b/src/board/system76/lemp11/board.c
@@ -4,7 +4,6 @@
 #include <board/board.h>
 #include <board/espi.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 #include <ec/ec.h>
 
 
@@ -24,8 +23,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/lemp9/board.c b/src/board/system76/lemp9/board.c
index 24be56b..2e4a68c 100644
--- a/src/board/system76/lemp9/board.c
+++ b/src/board/system76/lemp9/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 
 void board_init(void) {
     // Allow CPU to boot
@@ -17,8 +16,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_on_ac(bool ac) { /* Fix unused variable */ ac = ac; }
diff --git a/src/board/system76/oryp5/board.c b/src/board/system76/oryp5/board.c
index f668968..be9dedd 100644
--- a/src/board/system76/oryp5/board.c
+++ b/src/board/system76/oryp5/board.c
@@ -3,7 +3,6 @@
 #include <board/board.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 
 void board_init(void) {
@@ -19,8 +18,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/oryp6/board.c b/src/board/system76/oryp6/board.c
index ae89aa0..ee35dbf 100644
--- a/src/board/system76/oryp6/board.c
+++ b/src/board/system76/oryp6/board.c
@@ -4,7 +4,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -21,8 +20,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/oryp7/board.c b/src/board/system76/oryp7/board.c
index ae89aa0..ee35dbf 100644
--- a/src/board/system76/oryp7/board.c
+++ b/src/board/system76/oryp7/board.c
@@ -4,7 +4,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -21,8 +20,6 @@ void board_init(void) {
     gpio_set(&SCI_N, true);
     gpio_set(&SMI_N, true);
     gpio_set(&SWI_N, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/oryp8/board.c b/src/board/system76/oryp8/board.c
index e97a381..2b577ee 100644
--- a/src/board/system76/oryp8/board.c
+++ b/src/board/system76/oryp8/board.c
@@ -5,7 +5,6 @@
 #include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/power.h>
-#include <board/wireless.h>
 #include <common/debug.h>
 #include <ec/ec.h>
 
@@ -16,8 +15,6 @@ void board_init(void) {
     gpio_set(&BKL_EN, true);
     // Enable camera
     gpio_set(&CCD_EN, true);
-
-    wireless_power(true);
 }
 
 void board_event(void) {
diff --git a/src/board/system76/oryp9/board.c b/src/board/system76/oryp9/board.c
index a23c759..7951c28 100644
--- a/src/board/system76/oryp9/board.c
+++ b/src/board/system76/oryp9/board.c
@@ -4,7 +4,6 @@
 #include <board/board.h>
 #include <board/espi.h>
 #include <board/gpio.h>
-#include <board/wireless.h>
 #include <ec/ec.h>
 
 void board_init(void) {
@@ -19,8 +18,6 @@ void board_init(void) {
     gpio_set(&CCD_EN, true);
     // Enable USB port power
     gpio_set(&USB_PWR_EN_N, false);
-
-    wireless_power(true);
 }
 
 void board_event(void) {