diff --git a/src/helpers/NRF52Board.h b/src/helpers/NRF52Board.h
index dba15f974..558a11157 100644
--- a/src/helpers/NRF52Board.h
+++ b/src/helpers/NRF52Board.h
@@ -31,7 +31,7 @@ class NRF52Board : public mesh::MainBoard {
 
 protected:
   uint8_t startup_reason;
-  char *ota_name;
+  const char *ota_name;
 
 #ifdef NRF52_POWER_MANAGEMENT
   uint32_t reset_reason;              // RESETREAS register value
@@ -45,7 +45,7 @@ protected:
 #endif
 
 public:
-  NRF52Board(char *otaname) : ota_name(otaname) {}
+  NRF52Board(const char *otaname) : ota_name(otaname) {}
   virtual void begin();
   virtual uint8_t getStartupReason() const override { return startup_reason; }
   virtual float getMCUTemperature() override;
@@ -73,9 +73,11 @@ public:
  * hardware requirements are met, this subclass can be used to enable the DC/DC
  * regulator.
  */
-class NRF52BoardDCDC : virtual public NRF52Board {
+class NRF52BoardDCDC : public NRF52Board {
 public:
-  NRF52BoardDCDC() {}
+  NRF52BoardDCDC() : NRF52Board(NULL) {}
+  NRF52BoardDCDC(const char *otaname) : NRF52Board(otaname) {}
+
   virtual void begin() override;
 };
 #endif
\ No newline at end of file
diff --git a/variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.h b/variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.h
index 0b0f701c2..ea93e5b24 100644
--- a/variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.h
+++ b/variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.h
@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT56230SMeshKitBoard() : NRF52Board("GAT562_OTA") {}
+  GAT56230SMeshKitBoard() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8
diff --git a/variants/gat562_mesh_evb_pro/GAT562EVBProBoard.h b/variants/gat562_mesh_evb_pro/GAT562EVBProBoard.h
index 66c770994..4450ee9eb 100644
--- a/variants/gat562_mesh_evb_pro/GAT562EVBProBoard.h
+++ b/variants/gat562_mesh_evb_pro/GAT562EVBProBoard.h
@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT562EVBProBoard() : NRF52Board("GAT562_OTA") {}
+  GAT562EVBProBoard() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8
diff --git a/variants/gat562_mesh_tracker_pro/GAT562MeshTrackerProBoard.h b/variants/gat562_mesh_tracker_pro/GAT562MeshTrackerProBoard.h
index 39b55911a..8893ee4e9 100644
--- a/variants/gat562_mesh_tracker_pro/GAT562MeshTrackerProBoard.h
+++ b/variants/gat562_mesh_tracker_pro/GAT562MeshTrackerProBoard.h
@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT562MeshTrackerProBoard() : NRF52Board("GAT562_OTA") {}
+  GAT562MeshTrackerProBoard() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8
diff --git a/variants/gat562_mesh_watch13/GAT56MeshWatch13Board.h b/variants/gat562_mesh_watch13/GAT56MeshWatch13Board.h
index 805ca67f2..166d6ff4a 100644
--- a/variants/gat562_mesh_watch13/GAT56MeshWatch13Board.h
+++ b/variants/gat562_mesh_watch13/GAT56MeshWatch13Board.h
@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT56MeshWatch13Board() : NRF52Board("GAT562_OTA") {}
+  GAT56MeshWatch13Board() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8
diff --git a/variants/heltec_mesh_solar/MeshSolarBoard.h b/variants/heltec_mesh_solar/MeshSolarBoard.h
index 816336255..39a7972ab 100644
--- a/variants/heltec_mesh_solar/MeshSolarBoard.h
+++ b/variants/heltec_mesh_solar/MeshSolarBoard.h
@@ -22,7 +22,7 @@
 
 class MeshSolarBoard : public NRF52BoardDCDC {
 public:
-  MeshSolarBoard() : NRF52Board("MESH_SOLAR_OTA") {}
+  MeshSolarBoard() : NRF52BoardDCDC("MESH_SOLAR_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {
diff --git a/variants/heltec_t096/T096Board.h b/variants/heltec_t096/T096Board.h
index 15c7e68b5..d3b036981 100644
--- a/variants/heltec_t096/T096Board.h
+++ b/variants/heltec_t096/T096Board.h
@@ -17,7 +17,7 @@ public:
   RefCountedDigitalPin periph_power;
   LoRaFEMControl loRaFEMControl;
 
-  T096Board() :periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE), NRF52Board("T096_OTA") {}
+  T096Board() : NRF52BoardDCDC("T096_OTA"), periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE) {}
   void begin();
 
   void onBeforeTransmit(void) override;
diff --git a/variants/heltec_t1/T1Board.h b/variants/heltec_t1/T1Board.h
index 9b46fd11a..388d76cf4 100644
--- a/variants/heltec_t1/T1Board.h
+++ b/variants/heltec_t1/T1Board.h
@@ -15,7 +15,7 @@ protected:
 public:
   RefCountedDigitalPin periph_power;
 
-  T1Board() : periph_power(PIN_TFT_VDD_CTL, PIN_TFT_VDD_CTL_ACTIVE), NRF52Board("T1_OTA") {}
+  T1Board() : NRF52BoardDCDC("T1_OTA"), periph_power(PIN_TFT_VDD_CTL, PIN_TFT_VDD_CTL_ACTIVE) {}
 
   void begin();
   void onBeforeTransmit() override;
diff --git a/variants/heltec_t114/T114Board.h b/variants/heltec_t114/T114Board.h
index bd76d3de4..0d81e4a20 100644
--- a/variants/heltec_t114/T114Board.h
+++ b/variants/heltec_t114/T114Board.h
@@ -16,7 +16,7 @@ protected:
 #endif
 
 public:
-  T114Board() : NRF52Board("T114_OTA") {}
+  T114Board() : NRF52BoardDCDC("T114_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/heltec_tower_v2/HeltecTowerV2Board.h b/variants/heltec_tower_v2/HeltecTowerV2Board.h
index 6912acdec..7f23683c7 100644
--- a/variants/heltec_tower_v2/HeltecTowerV2Board.h
+++ b/variants/heltec_tower_v2/HeltecTowerV2Board.h
@@ -14,7 +14,7 @@ protected:
 public:
   LoRaFEMControl loRaFEMControl;
 
-  HeltecTowerV2Board() : NRF52Board("TOWER_V2_OTA") {}
+  HeltecTowerV2Board() : NRF52BoardDCDC("TOWER_V2_OTA") {}
   void begin();
   void onBeforeTransmit() override;
   void onAfterTransmit() override;
diff --git a/variants/ikoka_handheld_nrf/IkokaNrf52Board.h b/variants/ikoka_handheld_nrf/IkokaNrf52Board.h
index 66752c0e4..23d83abe9 100644
--- a/variants/ikoka_handheld_nrf/IkokaNrf52Board.h
+++ b/variants/ikoka_handheld_nrf/IkokaNrf52Board.h
@@ -8,7 +8,7 @@
 
 class IkokaNrf52Board : public NRF52BoardDCDC {
 public:
-  IkokaNrf52Board() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaNrf52Board() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h b/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h
index 96b14dcaa..a310bd12e 100644
--- a/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h
+++ b/variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h
@@ -8,7 +8,7 @@
 
 class IkokaNanoNRFBoard : public NRF52BoardDCDC {
 public:
-  IkokaNanoNRFBoard() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaNanoNRFBoard() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/ikoka_stick_nrf/IkokaStickNRFBoard.h b/variants/ikoka_stick_nrf/IkokaStickNRFBoard.h
index 8d089f166..cefed3f16 100644
--- a/variants/ikoka_stick_nrf/IkokaStickNRFBoard.h
+++ b/variants/ikoka_stick_nrf/IkokaStickNRFBoard.h
@@ -8,7 +8,7 @@
 
 class IkokaStickNRFBoard : public NRF52BoardDCDC {
 public:
-  IkokaStickNRFBoard() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaStickNRFBoard() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/lilygo_t_impulse_plus/TImpulsePlusBoard.h b/variants/lilygo_t_impulse_plus/TImpulsePlusBoard.h
index 30bbc3a5c..32fc8530f 100644
--- a/variants/lilygo_t_impulse_plus/TImpulsePlusBoard.h
+++ b/variants/lilygo_t_impulse_plus/TImpulsePlusBoard.h
@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  TImpulsePlusBoard() : NRF52Board("T-Impulse-Plus OTA") {}
+  TImpulsePlusBoard() : NRF52BoardDCDC("T-Impulse-Plus OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/lilygo_techo/TechoBoard.h b/variants/lilygo_techo/TechoBoard.h
index 867fc24cf..616f3e039 100644
--- a/variants/lilygo_techo/TechoBoard.h
+++ b/variants/lilygo_techo/TechoBoard.h
@@ -15,7 +15,7 @@
 
 class TechoBoard : public NRF52BoardDCDC {
 public:
-  TechoBoard() : NRF52Board("TECHO_OTA") {}
+  TechoBoard() : NRF52BoardDCDC("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 
diff --git a/variants/lilygo_techo_card/TechoCardBoard.h b/variants/lilygo_techo_card/TechoCardBoard.h
index a2ee3ea1e..9def89dd3 100644
--- a/variants/lilygo_techo_card/TechoCardBoard.h
+++ b/variants/lilygo_techo_card/TechoCardBoard.h
@@ -17,7 +17,7 @@
 class TechoCardBoard : public NRF52BoardDCDC {
   bool _torchStatus = false;
 public:
-  TechoCardBoard() : NRF52Board("TECHO_OTA") {}
+  TechoCardBoard() : NRF52BoardDCDC("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
   void onBeforeTransmit(void) override;
diff --git a/variants/lilygo_techo_lite/TechoBoard.h b/variants/lilygo_techo_lite/TechoBoard.h
index 1e5651e78..43af24c82 100644
--- a/variants/lilygo_techo_lite/TechoBoard.h
+++ b/variants/lilygo_techo_lite/TechoBoard.h
@@ -13,7 +13,7 @@
 
 class TechoBoard : public NRF52BoardDCDC {
 public:
-  TechoBoard() : NRF52Board("TECHO_OTA") {}
+  TechoBoard() : NRF52BoardDCDC("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 
diff --git a/variants/mesh_pocket/MeshPocket.h b/variants/mesh_pocket/MeshPocket.h
index e215eb776..2293382ac 100644
--- a/variants/mesh_pocket/MeshPocket.h
+++ b/variants/mesh_pocket/MeshPocket.h
@@ -11,7 +11,7 @@
 
 class HeltecMeshPocket : public NRF52BoardDCDC {
 public:
-  HeltecMeshPocket() : NRF52Board("MESH_POCKET_OTA") {}
+  HeltecMeshPocket() : NRF52BoardDCDC("MESH_POCKET_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {
diff --git a/variants/meshtiny/MeshtinyBoard.h b/variants/meshtiny/MeshtinyBoard.h
index 67a521fe9..cf67f6312 100644
--- a/variants/meshtiny/MeshtinyBoard.h
+++ b/variants/meshtiny/MeshtinyBoard.h
@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  MeshtinyBoard() : NRF52Board("Meshtiny OTA") {}
+  MeshtinyBoard() : NRF52BoardDCDC("Meshtiny OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/meshtracker_x1/MeshTrackerX1Board.h b/variants/meshtracker_x1/MeshTrackerX1Board.h
index 51f022e0b..828268ba9 100644
--- a/variants/meshtracker_x1/MeshTrackerX1Board.h
+++ b/variants/meshtracker_x1/MeshTrackerX1Board.h
@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  MeshTrackerX1Board() : NRF52Board("X1_OTA") {}
+  MeshTrackerX1Board() : NRF52BoardDCDC("X1_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {
diff --git a/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h b/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h
index 450a3d13b..59c51b125 100644
--- a/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h
+++ b/variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h
@@ -25,7 +25,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  MinewsemiME25LS01Board() : NRF52Board("Minewsemi_OTA") {}
+  MinewsemiME25LS01Board() : NRF52BoardDCDC("Minewsemi_OTA") {}
   void begin();
 
 #define BATTERY_SAMPLES 8
diff --git a/variants/muziworks_r1_neo/R1NeoBoard.h b/variants/muziworks_r1_neo/R1NeoBoard.h
index c56f1f5c2..853eaea97 100644
--- a/variants/muziworks_r1_neo/R1NeoBoard.h
+++ b/variants/muziworks_r1_neo/R1NeoBoard.h
@@ -15,7 +15,7 @@ protected:
 #endif
 
 public:
-  R1NeoBoard() : NRF52Board("R1NEO_OTA") {}
+  R1NeoBoard() : NRF52BoardDCDC("R1NEO_OTA") {}
   void begin();
 
 #ifdef NRF52_POWER_MANAGEMENT
diff --git a/variants/promicro/PromicroBoard.h b/variants/promicro/PromicroBoard.h
index ee16c9654..dc44dadfa 100644
--- a/variants/promicro/PromicroBoard.h
+++ b/variants/promicro/PromicroBoard.h
@@ -13,7 +13,7 @@ protected:
   float adc_mult = ADC_MULTIPLIER;
 
 public:
-  PromicroBoard() : NRF52Board("ProMicro_OTA") {}
+  PromicroBoard() : NRF52BoardDCDC("ProMicro_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8
diff --git a/variants/rak3401/RAK3401Board.h b/variants/rak3401/RAK3401Board.h
index 3a080d5e2..17ec1e5a9 100644
--- a/variants/rak3401/RAK3401Board.h
+++ b/variants/rak3401/RAK3401Board.h
@@ -17,7 +17,7 @@ protected:
   void initiateShutdown(uint8_t reason) override;
 #endif
 public:
-  RAK3401Board() : NRF52Board("RAK3401_OTA") {}
+  RAK3401Board() : NRF52BoardDCDC("RAK3401_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8
diff --git a/variants/rak4631/RAK4631Board.h b/variants/rak4631/RAK4631Board.h
index 7e67165b1..ac95930d1 100644
--- a/variants/rak4631/RAK4631Board.h
+++ b/variants/rak4631/RAK4631Board.h
@@ -15,7 +15,7 @@ protected:
 #endif
 
 public:
-  RAK4631Board() : NRF52Board("RAK4631_OTA") {}
+  RAK4631Board() : NRF52BoardDCDC("RAK4631_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8
diff --git a/variants/rak_wismesh_tag/RAKWismeshTagBoard.h b/variants/rak_wismesh_tag/RAKWismeshTagBoard.h
index daa90d746..bb9849675 100644
--- a/variants/rak_wismesh_tag/RAKWismeshTagBoard.h
+++ b/variants/rak_wismesh_tag/RAKWismeshTagBoard.h
@@ -10,7 +10,7 @@
 
 class RAKWismeshTagBoard : public NRF52BoardDCDC {
 public:
-  RAKWismeshTagBoard() : NRF52Board("WISMESHTAG_OTA") {}
+  RAKWismeshTagBoard() : NRF52BoardDCDC("WISMESHTAG_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED) && defined(LED_STATE_ON)
diff --git a/variants/sensecap_solar/SenseCapSolarBoard.h b/variants/sensecap_solar/SenseCapSolarBoard.h
index 5a8861c29..5d58c0f38 100644
--- a/variants/sensecap_solar/SenseCapSolarBoard.h
+++ b/variants/sensecap_solar/SenseCapSolarBoard.h
@@ -11,7 +11,7 @@ protected:
 #endif
 
 public:
-  SenseCapSolarBoard() : NRF52Board("SENSECAP_SOLAR_OTA") {}
+  SenseCapSolarBoard() : NRF52BoardDCDC("SENSECAP_SOLAR_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/t1000-e/T1000eBoard.h b/variants/t1000-e/T1000eBoard.h
index 1111d3c40..f04e78765 100644
--- a/variants/t1000-e/T1000eBoard.h
+++ b/variants/t1000-e/T1000eBoard.h
@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  T1000eBoard() : NRF52Board("T1000E_OTA") {}
+  T1000eBoard() : NRF52BoardDCDC("T1000E_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {
diff --git a/variants/thinknode_m3/ThinkNodeM3Board.h b/variants/thinknode_m3/ThinkNodeM3Board.h
index 9e8f49894..80dc68917 100644
--- a/variants/thinknode_m3/ThinkNodeM3Board.h
+++ b/variants/thinknode_m3/ThinkNodeM3Board.h
@@ -14,7 +14,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  ThinkNodeM3Board() : NRF52Board("THINKNODE_M3_OTA") {}
+  ThinkNodeM3Board() : NRF52BoardDCDC("THINKNODE_M3_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 
diff --git a/variants/thinknode_m6/ThinkNodeM6Board.h b/variants/thinknode_m6/ThinkNodeM6Board.h
index 78815e2c9..868906420 100644
--- a/variants/thinknode_m6/ThinkNodeM6Board.h
+++ b/variants/thinknode_m6/ThinkNodeM6Board.h
@@ -19,7 +19,7 @@ protected:
 #endif
 
 public:
-  ThinkNodeM6Board() : NRF52Board("THINKNODE_M6_OTA") {}
+  ThinkNodeM6Board() : NRF52BoardDCDC("THINKNODE_M6_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 
diff --git a/variants/wio-tracker-l1/WioTrackerL1Board.h b/variants/wio-tracker-l1/WioTrackerL1Board.h
index e376e0666..332ca58a0 100644
--- a/variants/wio-tracker-l1/WioTrackerL1Board.h
+++ b/variants/wio-tracker-l1/WioTrackerL1Board.h
@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  WioTrackerL1Board() : NRF52Board("WioTrackerL1 OTA") {}
+  WioTrackerL1Board() : NRF52BoardDCDC("WioTrackerL1 OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)
diff --git a/variants/wio_wm1110/WioWM1110Board.h b/variants/wio_wm1110/WioWM1110Board.h
index 26f95c868..6361cfed4 100644
--- a/variants/wio_wm1110/WioWM1110Board.h
+++ b/variants/wio_wm1110/WioWM1110Board.h
@@ -13,7 +13,7 @@
 
 class WioWM1110Board : public NRF52BoardDCDC {
 public:
-  WioWM1110Board() : NRF52Board("WM1110_OTA") {}
+  WioWM1110Board() : NRF52BoardDCDC("WM1110_OTA") {}
   void begin();
 
 #if defined(LED_GREEN)
diff --git a/variants/xiao_nrf52/XiaoNrf52Board.h b/variants/xiao_nrf52/XiaoNrf52Board.h
index e71e7f651..edcc4d14e 100644
--- a/variants/xiao_nrf52/XiaoNrf52Board.h
+++ b/variants/xiao_nrf52/XiaoNrf52Board.h
@@ -17,7 +17,7 @@ protected:
 #endif
 
 public:
-  XiaoNrf52Board() : NRF52Board("XIAO_NRF52_OTA") {}
+  XiaoNrf52Board() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)