diff --git a/variants/gat562_30s_mesh_kit/platformio.ini b/variants/gat562_30s_mesh_kit/platformio.ini
index 89276a49..47539743 100644
--- a/variants/gat562_30s_mesh_kit/platformio.ini
+++ b/variants/gat562_30s_mesh_kit/platformio.ini
@@ -2,12 +2,13 @@
 extends = nrf52_base
 board = rak4631
 board_check = true
+board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/gat562_30s_mesh_kit
   -D RAK_4631
   -D RAK_BOARD
-  -D NRF52_POWER_MANAGEMENT
+;  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1
diff --git a/variants/gat562_mesh_evb_pro/platformio.ini b/variants/gat562_mesh_evb_pro/platformio.ini
index b3e89417..d7de585a 100644
--- a/variants/gat562_mesh_evb_pro/platformio.ini
+++ b/variants/gat562_mesh_evb_pro/platformio.ini
@@ -5,7 +5,7 @@ board_check = true
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/gat562_mesh_evb_pro
-  -D NRF52_POWER_MANAGEMENT
+;  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D RADIO_CLASS=CustomSX1262
diff --git a/variants/gat562_mesh_tracker_pro/platformio.ini b/variants/gat562_mesh_tracker_pro/platformio.ini
index 142cfe4b..a7a2124a 100644
--- a/variants/gat562_mesh_tracker_pro/platformio.ini
+++ b/variants/gat562_mesh_tracker_pro/platformio.ini
@@ -2,10 +2,11 @@
 extends = nrf52_base
 board = rak4631
 board_check = true
+board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/gat562_mesh_tracker_pro
-  -D NRF52_POWER_MANAGEMENT
+;  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1
diff --git a/variants/gat562_mesh_watch13/platformio.ini b/variants/gat562_mesh_watch13/platformio.ini
index f3510b74..f457424f 100644
--- a/variants/gat562_mesh_watch13/platformio.ini
+++ b/variants/gat562_mesh_watch13/platformio.ini
@@ -8,7 +8,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/gat562_mesh_watch13
   -D RAK_4631
   -D RAK_BOARD
-  -D NRF52_POWER_MANAGEMENT
+;  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1
diff --git a/variants/heltec_t114/platformio.ini b/variants/heltec_t114/platformio.ini
index 48fb4b0f..79034be8 100644
--- a/variants/heltec_t114/platformio.ini
+++ b/variants/heltec_t114/platformio.ini
@@ -12,7 +12,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/heltec_t114
   -I src/helpers/ui
   -D HELTEC_T114
-  -D NRF52_POWER_MANAGEMENT
+;  -D NRF52_POWER_MANAGEMENT
   -D P_LORA_DIO_1=20
   -D P_LORA_NSS=24
   -D P_LORA_RESET=25
@@ -173,6 +173,7 @@ build_flags =
   -D MAX_NEIGHBOURS=50
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+;  -D POWERSAVING_DEBUG=1
 
 [env:Heltec_t114_repeater_bridge_rs232]
 extends = Heltec_t114
@@ -222,6 +223,7 @@ build_flags =
   -D OFFLINE_QUEUE_SIZE=256
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+;  -D POWERSAVING_DEBUG=1
 build_src_filter = ${Heltec_t114_with_display.build_src_filter}
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio/*.cpp>
diff --git a/variants/promicro/platformio.ini b/variants/promicro/platformio.ini
index 90cb475f..38a7e206 100644
--- a/variants/promicro/platformio.ini
+++ b/variants/promicro/platformio.ini
@@ -1,6 +1,7 @@
 [Promicro]
 extends = nrf52_base
 board = promicro_nrf52840
+board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   -I variants/promicro
   -D PROMICRO
diff --git a/variants/rak_wismesh_tag/platformio.ini b/variants/rak_wismesh_tag/platformio.ini
index d6140187..edfe1b70 100644
--- a/variants/rak_wismesh_tag/platformio.ini
+++ b/variants/rak_wismesh_tag/platformio.ini
@@ -2,6 +2,7 @@
 extends = nrf52_base
 board = rak4631
 board_check = true
+board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/rak_wismesh_tag
diff --git a/variants/sensecap_solar/platformio.ini b/variants/sensecap_solar/platformio.ini
index 70405218..718dd90b 100644
--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@@ -10,7 +10,7 @@ build_flags = ${nrf52_base.build_flags}
   -I src/helpers/nrf52
   -D NRF52_PLATFORM=1
   -D USE_SX1262
-  -D NRF52_POWER_MANAGEMENT
+;  -D NRF52_POWER_MANAGEMENT
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_TX_LED=12
diff --git a/variants/xiao_nrf52/platformio.ini b/variants/xiao_nrf52/platformio.ini
index 1076bd8d..26acc866 100644
--- a/variants/xiao_nrf52/platformio.ini
+++ b/variants/xiao_nrf52/platformio.ini
@@ -9,7 +9,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/xiao_nrf52
   -UENV_INCLUDE_GPS
   -D NRF52_PLATFORM
-  -D NRF52_POWER_MANAGEMENT
+;  -D NRF52_POWER_MANAGEMENT
   -D XIAO_NRF52
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262