diff --git a/src/Power.cpp b/src/Power.cpp
index 498d702ef..d6dbd05d9 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -528,7 +528,7 @@ bool Power::axpChipInit()
     } else if (PMU->getChipModel() == XPOWERS_AXP2101) {
 
         /*The alternative version of T-Beam 1.1 differs from T-Beam V1.1 in that it uses an AXP2101 power chip*/
-#if defined(CONFIG_IDF_TARGET_ESP32)
+#if (HW_VENDOR == meshtastic_HardwareModel_TBEAM)
         // Unuse power channel
         PMU->disablePowerOutput(XPOWERS_DCDC2);
         PMU->disablePowerOutput(XPOWERS_DCDC3);
@@ -558,10 +558,8 @@ bool Power::axpChipInit()
         PMU->setPowerChannelVoltage(XPOWERS_ALDO3, 3300);
         PMU->enablePowerOutput(XPOWERS_ALDO3);
 
-#endif /*CONFIG_IDF_TARGET_ESP32*/
-
+#elif (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE)
         // t-beam s3 core
-#if defined(CONFIG_IDF_TARGET_ESP32S3)
         /**
          * gnss module power channel
          * The default ALDO4 is off, you need to turn on the GNSS power first, otherwise it will be invalid during initialization
diff --git a/src/sleep.cpp b/src/sleep.cpp
index 796c8a514..8b6346038 100644
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -99,10 +99,10 @@ void setGPSPower(bool on)
     if (pmu_found && PMU) {
         uint8_t model = PMU->getChipModel();
         if (model == XPOWERS_AXP2101) {
-#if defined(CONFIG_IDF_TARGET_ESP32)
+#if (HW_VENDOR == meshtastic_HardwareModel_TBEAM)
             // t-beam v1.2 GNSS power channel
             on ? PMU->enablePowerOutput(XPOWERS_ALDO3) : PMU->disablePowerOutput(XPOWERS_ALDO3);
-#else
+#elif (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE)
             // t-beam-s3-core GNSS  power channel
             on ? PMU->enablePowerOutput(XPOWERS_ALDO4) : PMU->disablePowerOutput(XPOWERS_ALDO4);
 #endif
@@ -242,10 +242,10 @@ void doDeepSleep(uint64_t msecToWake)
 
         uint8_t model = PMU->getChipModel();
         if (model == XPOWERS_AXP2101) {
-#if defined(CONFIG_IDF_TARGET_ESP32)
+#if (HW_VENDOR == meshtastic_HardwareModel_TBEAM)
             // t-beam v1.2 radio power channel
             PMU->disablePowerOutput(XPOWERS_ALDO2); // lora radio power channel
-#else
+#elif (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE)
             PMU->disablePowerOutput(XPOWERS_ALDO3); // lora radio power channel
 #endif
         } else if (model == XPOWERS_AXP192) {