diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
index 52a66e8ca..d29b2713e 100644
--- a/src/main/drivers/pwm_output.c
+++ b/src/main/drivers/pwm_output.c
@@ -40,7 +40,7 @@ loadDmaBufferFn *loadDmaBuffer;
 static pwmOutputPort_t servos[MAX_SUPPORTED_SERVOS];
 #endif
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 static pwmOutputPort_t beeperPwm;
 static uint16_t freqBeep = 0;
 #endif
@@ -464,7 +464,7 @@ void servoDevInit(const servoDevConfig_t *servoConfig)
 
 #endif
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 void pwmWriteBeeper(bool onoffBeep)
 {
         if (!beeperPwm.io)
diff --git a/src/main/drivers/pwm_output.h b/src/main/drivers/pwm_output.h
index 0177c8dac..3c5be8ee0 100644
--- a/src/main/drivers/pwm_output.h
+++ b/src/main/drivers/pwm_output.h
@@ -199,7 +199,7 @@ void pwmDshotMotorHardwareConfig(const timerHardware_t *timerHardware, uint8_t m
 void pwmCompleteDshotMotorUpdate(uint8_t motorCount);
 #endif
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 void pwmWriteBeeper(bool onoffBeep);
 void pwmToggleBeeper(void);
 void beeperPwmInit(const ioTag_t tag, uint16_t frequency);
diff --git a/src/main/drivers/sound_beeper.c b/src/main/drivers/sound_beeper.c
index 52e563c07..de976fa50 100644
--- a/src/main/drivers/sound_beeper.c
+++ b/src/main/drivers/sound_beeper.c
@@ -27,7 +27,7 @@
 
 #include "sound_beeper.h"
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 static IO_t beeperIO = DEFIO_IO(NONE);
 static bool beeperInverted = false;
 static uint16_t beeperFrequency = 0;
@@ -35,7 +35,7 @@ static uint16_t beeperFrequency = 0;
 
 void systemBeep(bool onoff)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     if (beeperFrequency == 0) {
         IOWrite(beeperIO, beeperInverted ? onoff : !onoff);
     } else {
@@ -48,7 +48,7 @@ void systemBeep(bool onoff)
 
 void systemBeepToggle(void)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     if (beeperFrequency == 0) {
         IOToggle(beeperIO);
     } else {
@@ -59,7 +59,7 @@ void systemBeepToggle(void)
 
 void beeperInit(const beeperDevConfig_t *config)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperFrequency = config->frequency;
     if (beeperFrequency == 0) {
         beeperIO = IOGetByTag(config->ioTag);
diff --git a/src/main/drivers/sound_beeper.h b/src/main/drivers/sound_beeper.h
index b7e839629..12ba74017 100644
--- a/src/main/drivers/sound_beeper.h
+++ b/src/main/drivers/sound_beeper.h
@@ -17,7 +17,7 @@
 
 #pragma once
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 #define BEEP_TOGGLE              systemBeepToggle()
 #define BEEP_OFF                 systemBeep(false)
 #define BEEP_ON                  systemBeep(true)
diff --git a/src/main/fc/config.c b/src/main/fc/config.c
index 3ec77252c..8975fdd11 100644
--- a/src/main/fc/config.c
+++ b/src/main/fc/config.c
@@ -500,7 +500,7 @@ void changePidProfile(uint8_t pidProfileIndex)
 
 void beeperOffSet(uint32_t mask)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperConfigMutable()->beeper_off_flags |= mask;
 #else
     UNUSED(mask);
@@ -509,7 +509,7 @@ void beeperOffSet(uint32_t mask)
 
 void beeperOffSetAll(uint8_t beeperCount)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperConfigMutable()->beeper_off_flags = (1 << beeperCount) -1;
 #else
     UNUSED(beeperCount);
@@ -518,7 +518,7 @@ void beeperOffSetAll(uint8_t beeperCount)
 
 void beeperOffClear(uint32_t mask)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperConfigMutable()->beeper_off_flags &= ~(mask);
 #else
     UNUSED(mask);
@@ -527,14 +527,14 @@ void beeperOffClear(uint32_t mask)
 
 void beeperOffClearAll(void)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperConfigMutable()->beeper_off_flags = 0;
 #endif
 }
 
 uint32_t getBeeperOffMask(void)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     return beeperConfig()->beeper_off_flags;
 #else
     return 0;
@@ -543,7 +543,7 @@ uint32_t getBeeperOffMask(void)
 
 void setBeeperOffMask(uint32_t mask)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperConfigMutable()->beeper_off_flags = mask;
 #else
     UNUSED(mask);
@@ -552,7 +552,7 @@ void setBeeperOffMask(uint32_t mask)
 
 uint32_t getPreferredBeeperOffMask(void)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     return beeperConfig()->preferred_beeper_off_flags;
 #else
     return 0;
@@ -561,7 +561,7 @@ uint32_t getPreferredBeeperOffMask(void)
 
 void setPreferredBeeperOffMask(uint32_t mask)
 {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperConfigMutable()->preferred_beeper_off_flags = mask;
 #else
     UNUSED(mask);
diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c
index 02b05e666..0558b8561 100644
--- a/src/main/fc/fc_init.c
+++ b/src/main/fc/fc_init.c
@@ -411,7 +411,7 @@ void init(void)
     }
 #endif
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperInit(beeperDevConfig());
 #endif
 /* temp until PGs are implemented. */
diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c
index 369c60708..339b272bf 100644
--- a/src/main/fc/fc_tasks.c
+++ b/src/main/fc/fc_tasks.c
@@ -255,7 +255,7 @@ void fcTasksInit(void)
 
     setTaskEnabled(TASK_DISPATCH, dispatchIsEnabled());
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
     setTaskEnabled(TASK_BEEPER, true);
 #endif
 #ifdef USE_GPS
@@ -437,7 +437,7 @@ cfTask_t cfTasks[TASK_COUNT] = {
         .staticPriority = TASK_PRIORITY_HIGH,
     },
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
     [TASK_BEEPER] = {
         .taskName = "BEEPER",
         .taskFunc = beeperUpdate,
diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c
index 4969fe146..c38010e42 100644
--- a/src/main/interface/cli.c
+++ b/src/main/interface/cli.c
@@ -2057,7 +2057,7 @@ static void cliFeature(char *cmdline)
     }
 }
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 static void printBeeper(uint8_t dumpMask, const beeperConfig_t *beeperConfig, const beeperConfig_t *beeperConfigDefault)
 {
     const uint8_t beeperCount = beeperTableEntryCount();
@@ -3162,7 +3162,7 @@ typedef struct {
 } cliResourceValue_t;
 
 const cliResourceValue_t resourceTable[] = {
-#ifdef USE_BEEPER
+#ifdef BEEPER
     { OWNER_BEEPER,        PG_BEEPER_DEV_CONFIG, offsetof(beeperDevConfig_t, ioTag), 0 },
 #endif
     { OWNER_MOTOR,         PG_MOTOR_CONFIG, offsetof(motorConfig_t, dev.ioTags[0]), MAX_SUPPORTED_MOTORS },
@@ -3557,7 +3557,7 @@ static void printConfig(char *cmdline, bool doDiff)
         cliPrintHashLine("feature");
         printFeature(dumpMask, &featureConfig_Copy, featureConfig());
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
         cliPrintHashLine("beeper");
         printBeeper(dumpMask, &beeperConfig_Copy, beeperConfig());
 #endif
@@ -3677,7 +3677,7 @@ static void cliHelp(char *cmdline);
 const clicmd_t cmdTable[] = {
     CLI_COMMAND_DEF("adjrange", "configure adjustment ranges", NULL, cliAdjustmentRange),
     CLI_COMMAND_DEF("aux", "configure modes", "<index> <mode> <aux> <start> <end> <logic>", cliAux),
-#ifdef USE_BEEPER
+#ifdef BEEPER
     CLI_COMMAND_DEF("beeper", "turn on/off beeper", "list\r\n"
         "\t<+|->[name]", cliBeeper),
 #endif
diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index bc5e9a269..551e56450 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -471,7 +471,7 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
         sbufWriteU32(dst, featureMask());
         break;
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
     case MSP_BEEPER_CONFIG:
         sbufWriteU32(dst, getBeeperOffMask());
         sbufWriteU8(dst, beeperConfig()->dshotBeaconTone);
@@ -1849,7 +1849,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
         featureSet(sbufReadU32(src)); // features bitmap
         break;
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
     case MSP_SET_BEEPER_CONFIG:
         beeperOffClearAll();
         setBeeperOffMask(sbufReadU32(src));
diff --git a/src/main/interface/settings.c b/src/main/interface/settings.c
index ff7d95fef..18548c4a5 100644
--- a/src/main/interface/settings.c
+++ b/src/main/interface/settings.c
@@ -524,7 +524,7 @@ const clivalue_t valueTable[] = {
     { "ibatv_offset",               VAR_INT16  | MASTER_VALUE, .config.minmax = { -16000, 16000 }, PG_CURRENT_SENSOR_VIRTUAL_CONFIG, offsetof(currentSensorVirtualConfig_t, offset) },
 #endif
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 // PG_BEEPER_DEV_CONFIG
     { "beeper_inversion",           VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_BEEPER_DEV_CONFIG, offsetof(beeperDevConfig_t, isInverted) },
     { "beeper_od",                  VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_BEEPER_DEV_CONFIG, offsetof(beeperDevConfig_t, isOpenDrain) },
diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index f9cdbf17d..ee2f10cc0 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -57,7 +57,8 @@
 #define IS_INVERTED     false
 #endif
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
+#define BEEPER_PIN      BEEPER
 #ifndef BEEPER_PWM_HZ
 #define BEEPER_PWM_HZ   0
 #endif
@@ -75,7 +76,7 @@
 #define BEEPER_COMMAND_REPEAT 0xFE
 #define BEEPER_COMMAND_STOP   0xFF
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 /* Beeper Sound Sequences: (Square wave generation)
  * Sequence must end with 0xFF or 0xFE. 0xFE repeats the sequence from
  * start when 0xFF stops the sound when it's completed.
diff --git a/src/main/io/serial_4way.c b/src/main/io/serial_4way.c
index 77eebc2f7..2ae60bd75 100644
--- a/src/main/io/serial_4way.c
+++ b/src/main/io/serial_4way.c
@@ -425,11 +425,11 @@ void esc4wayProcess(serialPort_t *mspPort)
     port = mspPort;
 
     // Start here  with UART Main loop
-#ifdef USE_BEEPER
+    #ifdef BEEPER
     // fix for buzzer often starts beeping continuously when the ESCs are read
     // switch beeper silent here
     beeperSilence();
-#endif
+    #endif
     bool isExitScheduled = false;
 
     while (1) {
diff --git a/src/main/osd_slave/osd_slave_init.c b/src/main/osd_slave/osd_slave_init.c
index 22b9a428b..61507c681 100644
--- a/src/main/osd_slave/osd_slave_init.c
+++ b/src/main/osd_slave/osd_slave_init.c
@@ -188,7 +188,7 @@ void init(void)
 
     serialInit(false, SERIAL_PORT_NONE);
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
     beeperInit(beeperDevConfig());
 #endif
 /* temp until PGs are implemented. */
diff --git a/src/main/pg/beeper.c b/src/main/pg/beeper.c
index de5bd1e15..b02689fcd 100644
--- a/src/main/pg/beeper.c
+++ b/src/main/pg/beeper.c
@@ -17,7 +17,7 @@
 
 #include <platform.h>
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
diff --git a/src/main/pg/beeper_dev.c b/src/main/pg/beeper_dev.c
index 3f7dc2ffa..ccccab5df 100644
--- a/src/main/pg/beeper_dev.c
+++ b/src/main/pg/beeper_dev.c
@@ -17,7 +17,7 @@
 
 #include "platform.h"
 
-#ifdef USE_BEEPER
+#ifdef BEEPER
 
 #include "drivers/io.h"
 #include "pg/pg.h"
@@ -35,12 +35,14 @@ PG_REGISTER_WITH_RESET_TEMPLATE(beeperDevConfig_t, beeperDevConfig, PG_BEEPER_DE
 #define IS_INVERTED     false
 #endif
 
+#ifdef BEEPER
+#define BEEPER_PIN      BEEPER
 #ifndef BEEPER_PWM_HZ
 #define BEEPER_PWM_HZ   0
 #endif
-
-#ifndef BEEPER_PIN
+#else
 #define BEEPER_PIN      NONE
+#define BEEPER_PWM_HZ   0
 #endif
 
 PG_RESET_TEMPLATE(beeperDevConfig_t, beeperDevConfig,
diff --git a/src/main/scheduler/scheduler.h b/src/main/scheduler/scheduler.h
index b2bf59d56..b6f24a8db 100644
--- a/src/main/scheduler/scheduler.h
+++ b/src/main/scheduler/scheduler.h
@@ -64,7 +64,7 @@ typedef enum {
     TASK_BATTERY_VOLTAGE,
     TASK_BATTERY_CURRENT,
     TASK_BATTERY_ALERTS,
-#ifdef USE_BEEPER
+#ifdef BEEPER
     TASK_BEEPER,
 #endif
 #ifdef USE_GPS
diff --git a/src/main/target/AIR32/target.h b/src/main/target/AIR32/target.h
index 3676d35ad..6af85e3e7 100644
--- a/src/main/target/AIR32/target.h
+++ b/src/main/target/AIR32/target.h
@@ -23,8 +23,7 @@
 
 #define LED0_PIN                PB5 // Blue LED - PB5
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA0
+#define BEEPER                  PA0
 
 // MPU6050 interrupts
 #define USE_EXTI
diff --git a/src/main/target/AIRHEROF3/target.h b/src/main/target/AIRHEROF3/target.h
index 45a91aa1e..ed77d4079 100644
--- a/src/main/target/AIRHEROF3/target.h
+++ b/src/main/target/AIRHEROF3/target.h
@@ -25,8 +25,7 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA12
+#define BEEPER                  PA12
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/ALIENFLIGHTF1/target.h b/src/main/target/ALIENFLIGHTF1/target.h
index 52d4d7ead..ee79f6601 100644
--- a/src/main/target/ALIENFLIGHTF1/target.h
+++ b/src/main/target/ALIENFLIGHTF1/target.h
@@ -25,8 +25,7 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA12
+#define BEEPER                  PA12
 
 #define USE_EXTI
 #define MAG_INT_EXTI            PC14
diff --git a/src/main/target/ALIENFLIGHTF3/hardware_revision.c b/src/main/target/ALIENFLIGHTF3/hardware_revision.c
index 33b467dc3..89dc02c8c 100644
--- a/src/main/target/ALIENFLIGHTF3/hardware_revision.c
+++ b/src/main/target/ALIENFLIGHTF3/hardware_revision.c
@@ -40,7 +40,7 @@ void detectHardwareRevision(void)
     IOInit(HWDetectPin, OWNER_SYSTEM, 0);
     IOConfigGPIO(HWDetectPin, IOCFG_IPU);
 
-    RXDetectPin = IOGetByTag(IO_TAG(BEEPER_PIN));
+    RXDetectPin = IOGetByTag(IO_TAG(BEEPER));
     IOInit(RXDetectPin, OWNER_SYSTEM, 0);
     IOConfigGPIO(RXDetectPin, IOCFG_IPU);
 
diff --git a/src/main/target/ALIENFLIGHTF3/target.h b/src/main/target/ALIENFLIGHTF3/target.h
index 676e25147..f61a54bdd 100644
--- a/src/main/target/ALIENFLIGHTF3/target.h
+++ b/src/main/target/ALIENFLIGHTF3/target.h
@@ -36,8 +36,7 @@
 #define LED0_A                  PB8
 #define LED1_A                  PB9
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA5
+#define BEEPER                  PA5
 
 #define USE_EXTI
 //#define DEBUG_MPU_DATA_READY_INTERRUPT
diff --git a/src/main/target/ALIENFLIGHTF4/target.h b/src/main/target/ALIENFLIGHTF4/target.h
index 1f2a15b64..94485a711 100644
--- a/src/main/target/ALIENFLIGHTF4/target.h
+++ b/src/main/target/ALIENFLIGHTF4/target.h
@@ -28,8 +28,7 @@
 #define LED0_PIN                PC12
 #define LED1_PIN                PD2
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC13
+#define BEEPER                  PC13
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART2      PC15
diff --git a/src/main/target/ALIENFLIGHTNGF7/target.h b/src/main/target/ALIENFLIGHTNGF7/target.h
index d45fd3f40..a0637dee0 100644
--- a/src/main/target/ALIENFLIGHTNGF7/target.h
+++ b/src/main/target/ALIENFLIGHTNGF7/target.h
@@ -28,8 +28,7 @@
 #define LED0_PIN                PC12
 #define LED1_PIN                PD2
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC13
+#define BEEPER                  PC13
 #define BEEPER_INVERTED
 
 // MPU interrupt
diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h
index 361609dab..cd0c7c3b2 100644
--- a/src/main/target/ALIENWHOOP/target.h
+++ b/src/main/target/ALIENWHOOP/target.h
@@ -57,8 +57,7 @@
 
 /* Lost Quad Mode and Alerts - RCX03-787 Low Voltage Active Buzzer
  */
-#define USE_BEEPER
-#define BEEPER_PIN             PA2
+#define BEEPER                 PA2
 #define BEEPER_INVERTED
 
 /* Serial Peripheral Interface (SPI) - Up to 50 Mbit/s on F7
diff --git a/src/main/target/ANYFCF7/target.h b/src/main/target/ANYFCF7/target.h
index 7ad5dfba6..2e98e28b3 100644
--- a/src/main/target/ANYFCF7/target.h
+++ b/src/main/target/ANYFCF7/target.h
@@ -24,8 +24,7 @@
 #define LED0_PIN   PB7
 #define LED1_PIN   PB6
 
-#define USE_BEEPER
-#define BEEPER_PIN PB2 // Unused pin, can be mapped to elsewhere
+#define BEEPER   PB2 // Unused pin, can be mapped to elsewhere
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN        PA4
diff --git a/src/main/target/ANYFCM7/target.h b/src/main/target/ANYFCM7/target.h
index 0290e711d..9478b34b6 100644
--- a/src/main/target/ANYFCM7/target.h
+++ b/src/main/target/ANYFCM7/target.h
@@ -26,8 +26,7 @@
 #define LED0_PIN   PB6  //red
 #define LED1_PIN   PB9  //blue
 
-#define USE_BEEPER
-#define BEEPER_PIN PB2 // Unused pin, can be mapped to elsewhere
+#define BEEPER   PB2 // Unused pin, can be mapped to elsewhere
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN        PA4
diff --git a/src/main/target/BEEROTORF4/target.h b/src/main/target/BEEROTORF4/target.h
index ad504de30..c1a887f59 100644
--- a/src/main/target/BEEROTORF4/target.h
+++ b/src/main/target/BEEROTORF4/target.h
@@ -22,8 +22,7 @@
 
 #define LED0_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB3
+#define BEEPER                  PB3
 #define BEEPER_INVERTED
 
 #define ENABLE_DSHOT_DMAR       true
diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h
index bb139974b..7096ddfe5 100644
--- a/src/main/target/BETAFLIGHTF3/target.h
+++ b/src/main/target/BETAFLIGHTF3/target.h
@@ -23,8 +23,7 @@
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define ENABLE_DSHOT_DMAR       true
diff --git a/src/main/target/BETAFLIGHTF4/target.h b/src/main/target/BETAFLIGHTF4/target.h
index 524d8ad4d..9e6312fca 100644
--- a/src/main/target/BETAFLIGHTF4/target.h
+++ b/src/main/target/BETAFLIGHTF4/target.h
@@ -24,8 +24,7 @@
 
 #define LED0_PIN                PB5
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #define BEEPER_INVERTED
 
 // PC13 used as inverter select GPIO for UART2
diff --git a/src/main/target/BLUEJAYF4/target.h b/src/main/target/BLUEJAYF4/target.h
index 5e68018ab..98d0acba7 100644
--- a/src/main/target/BLUEJAYF4/target.h
+++ b/src/main/target/BLUEJAYF4/target.h
@@ -32,8 +32,7 @@
 #define LED1_PIN                PB5
 #define LED2_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC1
+#define BEEPER                  PC1
 #define BEEPER_OPT              PB7
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/CC3D/target.h b/src/main/target/CC3D/target.h
index 399fdd8bd..8f36a8e85 100644
--- a/src/main/target/CC3D/target.h
+++ b/src/main/target/CC3D/target.h
@@ -23,8 +23,7 @@
 
 #define INVERTER_PIN_UART1      PB2 // PB2 (BOOT1) used as inverter select GPIO
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA15
+#define BEEPER                  PA15
 #define BEEPER_OPT              PA2
 
 #define USE_EXTI
diff --git a/src/main/target/CHEBUZZF3/target.h b/src/main/target/CHEBUZZF3/target.h
index 5f265b030..53112786f 100644
--- a/src/main/target/CHEBUZZF3/target.h
+++ b/src/main/target/CHEBUZZF3/target.h
@@ -29,8 +29,7 @@
 #define LED1_PIN                PE10  // Orange LEDs - PE10/PE14
 #define LED1_INVERTED
 
-#define USE_BEEPER
-#define BEEPER_PIN              PE9 // Red LEDs - PE9/PE13
+#define BEEPER                  PE9 // Red LEDs - PE9/PE13
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
index 5c41e47b8..4e9b7b7cd 100644
--- a/src/main/target/CJMCU/target.h
+++ b/src/main/target/CJMCU/target.h
@@ -25,7 +25,7 @@
 #define LED1_PIN                PC13
 #define LED2_PIN                PC15
 
-#undef USE_BEEPER
+#undef BEEPER
 
 #define USE_GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/CLRACINGF4/target.h b/src/main/target/CLRACINGF4/target.h
index d853b5727..5717374ce 100644
--- a/src/main/target/CLRACINGF4/target.h
+++ b/src/main/target/CLRACINGF4/target.h
@@ -24,8 +24,7 @@
 #endif
 
 #define LED0_PIN                  PB5
-#define USE_BEEPER
-#define BEEPER_PIN                PB4
+#define BEEPER                    PB4
 #define BEEPER_INVERTED
 #define BEEPER_PWM_HZ             3800 // Beeper PWM frequency in Hz
 
diff --git a/src/main/target/CLRACINGF7/target.h b/src/main/target/CLRACINGF7/target.h
index 21c9ce2d0..199506ff0 100644
--- a/src/main/target/CLRACINGF7/target.h
+++ b/src/main/target/CLRACINGF7/target.h
@@ -21,8 +21,7 @@
 #define USBD_PRODUCT_STRING "CLRACINGF7"
 
 #define LED0_PIN                PB0
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #define BEEPER_INVERTED
 
 //define camera control
diff --git a/src/main/target/COLIBRI/target.h b/src/main/target/COLIBRI/target.h
index e675231f4..95cbecfbf 100644
--- a/src/main/target/COLIBRI/target.h
+++ b/src/main/target/COLIBRI/target.h
@@ -29,8 +29,7 @@
 #define LED0_PIN                PC14
 #define LED1_PIN                PC13
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC5
+#define BEEPER                  PC5
 
 #define INVERTER_PIN_UART2      PB2 // PB2 used as inverter select GPIO
 
diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h
index c1466b941..9000ecbb7 100644
--- a/src/main/target/COLIBRI_RACE/target.h
+++ b/src/main/target/COLIBRI_RACE/target.h
@@ -28,8 +28,7 @@
 #define LED1_PIN                PC14
 #define LED2_PIN                PC13
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB13
+#define BEEPER                  PB13
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
diff --git a/src/main/target/CRAZYFLIE2/target.h b/src/main/target/CRAZYFLIE2/target.h
index 1ebc537e8..6fac2460f 100644
--- a/src/main/target/CRAZYFLIE2/target.h
+++ b/src/main/target/CRAZYFLIE2/target.h
@@ -113,8 +113,7 @@
 #if defined(CRAZYFLIE2BQ)
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC12
+#define BEEPER                  PC12
 
 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
diff --git a/src/main/target/DALRCF405/target.h b/src/main/target/DALRCF405/target.h
index 613c519a5..cf66a8901 100644
--- a/src/main/target/DALRCF405/target.h
+++ b/src/main/target/DALRCF405/target.h
@@ -26,8 +26,7 @@
 //LED & BEE------------------------------- 
 #define LED0_PIN                PC14
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC13
+#define BEEPER                  PC13
 #define BEEPER_INVERTED
 
 //define camera control
diff --git a/src/main/target/DOGE/target.h b/src/main/target/DOGE/target.h
index e3b70a01e..16fd7ff9a 100644
--- a/src/main/target/DOGE/target.h
+++ b/src/main/target/DOGE/target.h
@@ -28,8 +28,7 @@
 // tqfp48 pin 38
 #define LED2_PIN                PA15
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB2
+#define BEEPER                  PB2
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/EACHIF3/target.h b/src/main/target/EACHIF3/target.h
index 016157762..d370cc9e1 100644
--- a/src/main/target/EACHIF3/target.h
+++ b/src/main/target/EACHIF3/target.h
@@ -96,7 +96,7 @@
 
 
 #undef USE_SERVOS
-#undef USE_BEEPER
+#undef BEEPER
 
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
diff --git a/src/main/target/F4BY/target.h b/src/main/target/F4BY/target.h
index 0e673cb7b..372f2edac 100644
--- a/src/main/target/F4BY/target.h
+++ b/src/main/target/F4BY/target.h
@@ -24,8 +24,7 @@
 #define LED1_PIN                PE2 // Red LED
 #define LED2_PIN                PE1 // Blue LED
 
-#define USE_BEEPER
-#define BEEPER_PIN              PE5
+#define BEEPER                  PE5
 
 #define INVERTER_PIN_UART6      PD3
 
diff --git a/src/main/target/FF_FORTINIF4/target.h b/src/main/target/FF_FORTINIF4/target.h
index 88c76be58..fadf4ed65 100644
--- a/src/main/target/FF_FORTINIF4/target.h
+++ b/src/main/target/FF_FORTINIF4/target.h
@@ -27,8 +27,7 @@
 /*---------------------------------*/
 
 /*------------BEEPER---------------*/
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #define BEEPER_INVERTED
 /*---------------------------------*/
 
diff --git a/src/main/target/FF_PIKOBLX/target.h b/src/main/target/FF_PIKOBLX/target.h
index b6ac849d5..374af873e 100644
--- a/src/main/target/FF_PIKOBLX/target.h
+++ b/src/main/target/FF_PIKOBLX/target.h
@@ -38,8 +38,7 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PB5
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA0
+#define BEEPER                  PA0
 #define BEEPER_INVERTED
 
 // MPU6000 interrupts
diff --git a/src/main/target/FF_PIKOF4/target.h b/src/main/target/FF_PIKOF4/target.h
index 3153cccb5..d24e2594d 100644
--- a/src/main/target/FF_PIKOF4/target.h
+++ b/src/main/target/FF_PIKOF4/target.h
@@ -35,8 +35,7 @@
 /*---------------------------------*/
 
 /*------------BEEPER---------------*/
-#define USE_BEEPER
-#define BEEPER_PIN              PA14
+#define BEEPER                  PA14
 #define BEEPER_INVERTED
 /*---------------------------------*/
 
diff --git a/src/main/target/FISHDRONEF4/target.h b/src/main/target/FISHDRONEF4/target.h
index b05179cf6..eba5ab691 100644
--- a/src/main/target/FISHDRONEF4/target.h
+++ b/src/main/target/FISHDRONEF4/target.h
@@ -24,8 +24,7 @@
 #define LED0_PIN                PC13
 #define LED1_PIN                PC14
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6      PC8
diff --git a/src/main/target/FRSKYF3/target.h b/src/main/target/FRSKYF3/target.h
index ef5974150..417c0af2b 100644
--- a/src/main/target/FRSKYF3/target.h
+++ b/src/main/target/FRSKYF3/target.h
@@ -22,8 +22,7 @@
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE
 
 #define LED0_PIN                PB3
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/FRSKYF4/target.h b/src/main/target/FRSKYF4/target.h
index b03cd0edc..2f70f8903 100644
--- a/src/main/target/FRSKYF4/target.h
+++ b/src/main/target/FRSKYF4/target.h
@@ -20,8 +20,7 @@
 #define USE_TARGET_CONFIG
 
 #define LED0_PIN                PB5
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6      PC8
diff --git a/src/main/target/FURYF3/target.h b/src/main/target/FURYF3/target.h
index 87ed2bf7b..c0fc7ae24 100644
--- a/src/main/target/FURYF3/target.h
+++ b/src/main/target/FURYF3/target.h
@@ -31,8 +31,7 @@
 
 #define LED0_PIN                PC14
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/FURYF4/target.h b/src/main/target/FURYF4/target.h
index af43731fd..a36e63e15 100644
--- a/src/main/target/FURYF4/target.h
+++ b/src/main/target/FURYF4/target.h
@@ -28,8 +28,7 @@
 #define LED0_PIN                PB5
 #define LED1_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA8
+#define BEEPER                  PA8
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
diff --git a/src/main/target/FURYF7/target.h b/src/main/target/FURYF7/target.h
index 3da7203f4..7965191ed 100644
--- a/src/main/target/FURYF7/target.h
+++ b/src/main/target/FURYF7/target.h
@@ -24,8 +24,7 @@
 #define LED0_PIN                PB5
 #define LED1_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PD10
+#define BEEPER                  PD10
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/IMPULSERCF3/target.h b/src/main/target/IMPULSERCF3/target.h
index 7128acdba..fbeb28a19 100644
--- a/src/main/target/IMPULSERCF3/target.h
+++ b/src/main/target/IMPULSERCF3/target.h
@@ -25,8 +25,7 @@
 
 #define LED0_PIN                PB7
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC13
diff --git a/src/main/target/ISHAPEDF3/target.h b/src/main/target/ISHAPEDF3/target.h
index 49b5d1f20..941a5d34a 100644
--- a/src/main/target/ISHAPEDF3/target.h
+++ b/src/main/target/ISHAPEDF3/target.h
@@ -23,8 +23,7 @@
 
 #define LED0_PIN    PB3
 
-#define USE_BEEPER
-#define BEEPER_PIN  PC15
+#define BEEPER      PC15
 #define BEEPER_INVERTED
 
 
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 45a5b33f1..67a349abe 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -30,8 +30,7 @@
 #define LED1_PIN                PB4
 #define LED2_PIN                PB6
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC9
+#define BEEPER                  PC9
 #define BEEPER_INVERTED
 #define INVERTER_PIN_UART3      PB15
 
diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h
index f9dc30385..b4c1f0ad0 100644
--- a/src/main/target/KAKUTEF7/target.h
+++ b/src/main/target/KAKUTEF7/target.h
@@ -22,8 +22,7 @@
 
 #define LED0_PIN                PA2
 
-#define USE_BEEPER
-#define BEEPER_PIN              PD15
+#define BEEPER                  PD15
 #define BEEPER_INVERTED
 
 #define USE_ACC
diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h
index 4c010a06e..6a01913a2 100644
--- a/src/main/target/KISSFC/target.h
+++ b/src/main/target/KISSFC/target.h
@@ -31,8 +31,7 @@
 
 #define LED0_PIN                PB1
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB13
+#define BEEPER                  PB13
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/KISSFCV2F7/target.h b/src/main/target/KISSFCV2F7/target.h
index 3de1e024e..98572eb86 100644
--- a/src/main/target/KISSFCV2F7/target.h
+++ b/src/main/target/KISSFCV2F7/target.h
@@ -29,8 +29,7 @@
 #define LED1   PC8 // blingbling
 #define LED1_INVERTED
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC9
+#define BEEPER   PC9
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN          PB12
diff --git a/src/main/target/KIWIF4/target.h b/src/main/target/KIWIF4/target.h
index 8ba0cf4fc..b8d25ae35 100644
--- a/src/main/target/KIWIF4/target.h
+++ b/src/main/target/KIWIF4/target.h
@@ -39,8 +39,7 @@
 #define LED1_PIN                PB4
 #endif
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA8
+#define BEEPER                  PA8
 
 #define INVERTER_PIN_UART1      PC0 // PC0 used as inverter select GPIO
 
diff --git a/src/main/target/KROOZX/target.h b/src/main/target/KROOZX/target.h
index cdafbde76..808bcd534 100644
--- a/src/main/target/KROOZX/target.h
+++ b/src/main/target/KROOZX/target.h
@@ -30,8 +30,7 @@
 #define LED0_PIN                PA14 // Red LED
 #define LED1_PIN                PA13 // Green LED
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC1
+#define BEEPER                  PC1
 
 #define INVERTER_PIN_UART1      PB13
 #define INVERTER_PIN_UART6      PB12
diff --git a/src/main/target/LUMBAF3/target.h b/src/main/target/LUMBAF3/target.h
index ef84a7b97..47b1b1f29 100644
--- a/src/main/target/LUMBAF3/target.h
+++ b/src/main/target/LUMBAF3/target.h
@@ -20,8 +20,7 @@
 #define TARGET_BOARD_IDENTIFIER "MCF3" // LumbaF3 Flight Controller by mC
 
 #define LED0_PIN                PB3
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PA3
diff --git a/src/main/target/LUX_RACE/target.h b/src/main/target/LUX_RACE/target.h
index e6f675614..9f31b3e20 100644
--- a/src/main/target/LUX_RACE/target.h
+++ b/src/main/target/LUX_RACE/target.h
@@ -33,11 +33,9 @@
 #endif
 
 #ifdef LUXV2_RACE
-#define USE_BEEPER
-#define BEEPER_PIN              PB9
+#define BEEPER                  PB9
 #else
-#define USE_BEEPER
-#define BEEPER_PIN              PB13
+#define BEEPER                  PB13
 #endif
 #define BEEPER_INVERTED
 
diff --git a/src/main/target/MATEKF405/target.h b/src/main/target/MATEKF405/target.h
index be38908f8..8f83bde57 100644
--- a/src/main/target/MATEKF405/target.h
+++ b/src/main/target/MATEKF405/target.h
@@ -23,8 +23,7 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PA14
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC13
+#define BEEPER                  PC13
 #define BEEPER_INVERTED
 
 #define ENABLE_DSHOT_DMAR       true
diff --git a/src/main/target/MATEKF411/target.h b/src/main/target/MATEKF411/target.h
index c4aeef1f4..5e4af3688 100644
--- a/src/main/target/MATEKF411/target.h
+++ b/src/main/target/MATEKF411/target.h
@@ -23,8 +23,7 @@
 #define LED0_PIN                PC13
 #define LED1_PIN                PC14
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB2
+#define BEEPER                  PB2
 #define BEEPER_INVERTED
 
 // *************** Gyro & ACC **********************
diff --git a/src/main/target/MATEKF411RX/target.h b/src/main/target/MATEKF411RX/target.h
index 7ea5c8f88..8efd0d0be 100644
--- a/src/main/target/MATEKF411RX/target.h
+++ b/src/main/target/MATEKF411RX/target.h
@@ -22,8 +22,7 @@
 
 #define LED0_PIN                PC13
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h
index 0a6ab8eac..5e2aa1026 100644
--- a/src/main/target/MATEKF722/target.h
+++ b/src/main/target/MATEKF722/target.h
@@ -24,8 +24,7 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PA14
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC13
+#define BEEPER                  PC13
 #define BEEPER_INVERTED
 
 // *************** Gyro & ACC **********************
diff --git a/src/main/target/MICROSCISKY/target.h b/src/main/target/MICROSCISKY/target.h
index 6cc27d6ce..2e16f0137 100644
--- a/src/main/target/MICROSCISKY/target.h
+++ b/src/main/target/MICROSCISKY/target.h
@@ -22,8 +22,7 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA12
+#define BEEPER                  PA12
 
 #define BARO_XCLR_PIN           PC13
 #define BARO_EOC_PIN            PC14
diff --git a/src/main/target/MIDELICF3/target.h b/src/main/target/MIDELICF3/target.h
index 4db60465e..f5bcc7294 100644
--- a/src/main/target/MIDELICF3/target.h
+++ b/src/main/target/MIDELICF3/target.h
@@ -21,8 +21,7 @@
 
 #define LED0_PIN                PB5
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC14
+#define BEEPER                  PC14
 
 #define USE_GYRO
 #define USE_GYRO_MPU6050
diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h
index 9173bb09f..7f9da2541 100644
--- a/src/main/target/MOTOLAB/target.h
+++ b/src/main/target/MOTOLAB/target.h
@@ -25,8 +25,7 @@
 #define LED0_PIN                PB5 // Blue LEDs - PB5
 //#define LED1_PIN                PB9 // Green LEDs - PB9
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA0
+#define BEEPER                  PA0
 #define BEEPER_INVERTED
 
 // MPU6050 interrupts
diff --git a/src/main/target/MOTOLABF4/target.h b/src/main/target/MOTOLABF4/target.h
index 0e6f6706d..2e87a354b 100644
--- a/src/main/target/MOTOLABF4/target.h
+++ b/src/main/target/MOTOLABF4/target.h
@@ -31,8 +31,7 @@
 #define LED0_PIN                PC3
 //#define LED1                    PC4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN          PA4
diff --git a/src/main/target/MULTIFLITEPICO/target.h b/src/main/target/MULTIFLITEPICO/target.h
index 5ed3e51f5..48c0293dd 100644
--- a/src/main/target/MULTIFLITEPICO/target.h
+++ b/src/main/target/MULTIFLITEPICO/target.h
@@ -24,8 +24,7 @@
 
 #define LED0_PIN                PB3
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/NAZE/target.h b/src/main/target/NAZE/target.h
index 276271923..467e904bd 100644
--- a/src/main/target/NAZE/target.h
+++ b/src/main/target/NAZE/target.h
@@ -29,8 +29,7 @@
 #define LED0_PIN                PB3
 #define LED1_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA12
+#define BEEPER                  PA12
 
 #if defined(AFROMINI)
 #define BEEPER_INVERTED
diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h
index 79ccff945..ab39faa42 100644
--- a/src/main/target/NERO/target.h
+++ b/src/main/target/NERO/target.h
@@ -28,8 +28,7 @@
 #define LED1_PIN                PB5
 #define LED2_PIN                PB4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC1
+#define BEEPER                  PC1
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
diff --git a/src/main/target/NOX/target.h b/src/main/target/NOX/target.h
index 75f30ba42..e4484a11b 100644
--- a/src/main/target/NOX/target.h
+++ b/src/main/target/NOX/target.h
@@ -22,8 +22,7 @@
 
 #define LED0_PIN                PA4
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC13
+#define BEEPER                  PC13
 #define BEEPER_INVERTED
 
 #define USE_DSHOT_DMAR
diff --git a/src/main/target/NUCLEOF446RE/target.h b/src/main/target/NUCLEOF446RE/target.h
index 828b045fd..70cc6c2cf 100644
--- a/src/main/target/NUCLEOF446RE/target.h
+++ b/src/main/target/NUCLEOF446RE/target.h
@@ -22,8 +22,7 @@
 
 #define LED0_PIN                PA5  // Onboard LED
 
-//#define USE_BEEPER
-//#define BEEPER_PIN                PD12
+//#define BEEPER                  PD12
 
 #define USE_EXTI
 
diff --git a/src/main/target/NUCLEOF7/target.h b/src/main/target/NUCLEOF7/target.h
index 8bb4f0663..bcdf35b8a 100644
--- a/src/main/target/NUCLEOF7/target.h
+++ b/src/main/target/NUCLEOF7/target.h
@@ -24,8 +24,7 @@
 #define LED0_PIN   PB7
 #define LED1_PIN   PB14
 
-#define USE_BEEPER
-#define BEEPER_PIN PA0
+#define BEEPER   PA0
 #define BEEPER_INVERTED
 
 #define USE_ACC
diff --git a/src/main/target/NUCLEOF722/target.h b/src/main/target/NUCLEOF722/target.h
index 647fa500f..1eb088081 100644
--- a/src/main/target/NUCLEOF722/target.h
+++ b/src/main/target/NUCLEOF722/target.h
@@ -26,8 +26,7 @@
 #define LED0_PIN   PB7  // blue
 #define LED1_PIN   PB14 // red
 
-#define USE_BEEPER
-#define BEEPER_PIN PA0
+#define BEEPER   PA0
 #define BEEPER_INVERTED
 
 #define USE_ACC
diff --git a/src/main/target/OMNIBUS/target.h b/src/main/target/OMNIBUS/target.h
index 012c65655..eb147051d 100644
--- a/src/main/target/OMNIBUS/target.h
+++ b/src/main/target/OMNIBUS/target.h
@@ -37,8 +37,7 @@
 
 #define LED0_PIN                PB3
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h
index 77aabc22b..a64e67562 100644
--- a/src/main/target/OMNIBUSF4/target.h
+++ b/src/main/target/OMNIBUSF4/target.h
@@ -50,8 +50,7 @@
 
 #define LED0_PIN                PB5
 //#define LED1_PIN                PB4 // Remove this at the next major release
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #define BEEPER_INVERTED
 
 #if defined(OMNIBUSF4SD) || defined(DYSF4PRO)
diff --git a/src/main/target/OMNIBUSF7/target.h b/src/main/target/OMNIBUSF7/target.h
index f7b2ff3c6..fbc6accaf 100644
--- a/src/main/target/OMNIBUSF7/target.h
+++ b/src/main/target/OMNIBUSF7/target.h
@@ -30,9 +30,7 @@
 
 //LED & BEEPER------------------------------
 #define LED0_PIN                PE0
-
-#define USE_BEEPER
-#define BEEPER_PIN              PD15
+#define BEEPER                  PD15
 #define BEEPER_INVERTED
 
 //CAMERA CONTROL----------------------------
diff --git a/src/main/target/PYRODRONEF4/target.h b/src/main/target/PYRODRONEF4/target.h
index a211bc3a5..93e9904d5 100644
--- a/src/main/target/PYRODRONEF4/target.h
+++ b/src/main/target/PYRODRONEF4/target.h
@@ -18,8 +18,7 @@
 #define USBD_PRODUCT_STRING "PYRODRONEF4"
 
 #define LED0_PIN                  PB4
-#define USE_BEEPER
-#define BEEPER_PIN                PB5
+#define BEEPER                    PB5
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART1        PC3       // PC3 used as sBUS inverter select GPIO
diff --git a/src/main/target/RACEBASE/target.h b/src/main/target/RACEBASE/target.h
index f5c309307..f2048915f 100644
--- a/src/main/target/RACEBASE/target.h
+++ b/src/main/target/RACEBASE/target.h
@@ -27,8 +27,7 @@
 #define LED1_PIN                PB4
 #define LED1_INVERTED
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA12
+#define BEEPER                  PA12
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/RCEXPLORERF3/target.h b/src/main/target/RCEXPLORERF3/target.h
index ec8326aa2..ec1a06c60 100644
--- a/src/main/target/RCEXPLORERF3/target.h
+++ b/src/main/target/RCEXPLORERF3/target.h
@@ -30,8 +30,7 @@
 #define LED0_PIN    PB4
 #define LED1_PIN    PB5
 
-#define USE_BEEPER
-#define BEEPER_PIN  PA0
+#define BEEPER      PA0
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/REVO/target.h b/src/main/target/REVO/target.h
index b63aaa7b0..02e8e82ca 100644
--- a/src/main/target/REVO/target.h
+++ b/src/main/target/REVO/target.h
@@ -56,21 +56,17 @@
 
 // Disable LED1, conflicts with AirbotF4/Flip32F4/Revolt beeper
 #if defined(AIRBOTF4) || defined(AIRBOTF4SD)
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #define BEEPER_INVERTED
 #elif defined(REVOLT)
-#define USE_BEEPER
-#define BEEPER_PIN              PB4
+#define BEEPER                  PB4
 #elif defined(SOULF4)
-#define USE_BEEPER
-#define BEEPER_PIN              PB6
+#define BEEPER                  PB6
 #define BEEPER_INVERTED
 #else
 #define LED1_PIN                PB4
 // Leave beeper here but with none as io - so disabled unless mapped.
-#define USE_BEEPER
-#define BEEPER_PIN              NONE
+#define BEEPER                  NONE
 #endif
 
 #if defined(REVOLT)
diff --git a/src/main/target/REVONANO/target.h b/src/main/target/REVONANO/target.h
index 2d98edafd..1ad62c353 100644
--- a/src/main/target/REVONANO/target.h
+++ b/src/main/target/REVONANO/target.h
@@ -26,8 +26,7 @@
 #define LED0_PIN                PC14
 #define LED1_PIN                PC13
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC13
+#define BEEPER                  PC13
 
 #define MPU6500_CS_PIN          PB12
 #define MPU6500_SPI_INSTANCE    SPI2
diff --git a/src/main/target/RG_SSD_F3/target.h b/src/main/target/RG_SSD_F3/target.h
index 21c078381..b4db6cd6c 100644
--- a/src/main/target/RG_SSD_F3/target.h
+++ b/src/main/target/RG_SSD_F3/target.h
@@ -22,8 +22,7 @@
 #define LED0_PIN                 PC1
 #define LED1_PIN                 PC0
 
-#define USE_BEEPER
-#define BEEPER_PIN               PA8
+#define BEEPER                   PA8
 #define BEEPER_INVERTED
 
 #define MPU6000_CS_PIN           PB2
diff --git a/src/main/target/SINGULARITY/target.h b/src/main/target/SINGULARITY/target.h
index 6b5b30867..c7f10d461 100644
--- a/src/main/target/SINGULARITY/target.h
+++ b/src/main/target/SINGULARITY/target.h
@@ -23,8 +23,7 @@
 
 #define LED0_PIN                PB3
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 
 #define USE_EXTI
 #define MPU_INT_EXTI            PC13
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index 00f4acb04..d8cecfd72 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -20,8 +20,7 @@
 #define TARGET_BOARD_IDENTIFIER "SIRF"
 
 #define LED0_PIN                PB2
-#define USE_BEEPER
-#define BEEPER_PIN              PA1
+#define BEEPER                  PA1
 
 
 #define USE_EXTI
diff --git a/src/main/target/SPARKY/target.h b/src/main/target/SPARKY/target.h
index e2edb881b..e72e8a859 100644
--- a/src/main/target/SPARKY/target.h
+++ b/src/main/target/SPARKY/target.h
@@ -24,8 +24,7 @@
 #define LED0_PIN                PB4  // Blue (Rev 1 & 2) - PB4
 #define LED1_PIN                PB5  // Green (Rev 1) / Red (Rev 2) - PB5
 
-#define USE_BEEPER
-#define BEEPER_PIN              PA1
+#define BEEPER                  PA1
 #define BEEPER_INVERTED
 
 // MPU6050 interrupts
diff --git a/src/main/target/SPARKY2/target.h b/src/main/target/SPARKY2/target.h
index da2b6b232..f741205d4 100644
--- a/src/main/target/SPARKY2/target.h
+++ b/src/main/target/SPARKY2/target.h
@@ -27,8 +27,7 @@
 #define LED1_PIN                PB4
 #define LED2_PIN                PB6
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC9
+#define BEEPER                  PC9
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6      PC6
diff --git a/src/main/target/SPEKTRUMF400/target.h b/src/main/target/SPEKTRUMF400/target.h
index 14942b15d..0f5c2172a 100644
--- a/src/main/target/SPEKTRUMF400/target.h
+++ b/src/main/target/SPEKTRUMF400/target.h
@@ -22,8 +22,7 @@
 #define LED0_PIN                PA15
 #define LED1_PIN                PC8
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC2
+#define BEEPER                  PC2
 #define BEEPER_INVERTED
 
 #define USE_SPI
diff --git a/src/main/target/SPRACINGF3/target.h b/src/main/target/SPRACINGF3/target.h
index 8e1f74b57..d173d6e9c 100644
--- a/src/main/target/SPRACINGF3/target.h
+++ b/src/main/target/SPRACINGF3/target.h
@@ -37,8 +37,7 @@
 #define LED0_PIN                PB3
 #endif
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF3EVO/target.h b/src/main/target/SPRACINGF3EVO/target.h
index 6a0672e03..b07209e34 100644
--- a/src/main/target/SPRACINGF3EVO/target.h
+++ b/src/main/target/SPRACINGF3EVO/target.h
@@ -51,8 +51,7 @@
 
 #define LED0_PIN                PB8
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF3MINI/target.h b/src/main/target/SPRACINGF3MINI/target.h
index c3eb72755..8f8d7b402 100644
--- a/src/main/target/SPRACINGF3MINI/target.h
+++ b/src/main/target/SPRACINGF3MINI/target.h
@@ -36,8 +36,7 @@
 #define LED0_PIN                PB3
 #endif
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF3NEO/target.h b/src/main/target/SPRACINGF3NEO/target.h
index 0246720e1..d44a505f5 100644
--- a/src/main/target/SPRACINGF3NEO/target.h
+++ b/src/main/target/SPRACINGF3NEO/target.h
@@ -33,8 +33,7 @@
 #define LED0_PIN                PB9
 #define LED1_PIN                PB2
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_EXTI
diff --git a/src/main/target/SPRACINGF4EVO/target.h b/src/main/target/SPRACINGF4EVO/target.h
index 6208a5145..e62cc3a8b 100644
--- a/src/main/target/SPRACINGF4EVO/target.h
+++ b/src/main/target/SPRACINGF4EVO/target.h
@@ -28,8 +28,7 @@
 
 #define LED0_PIN                PA0
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART2      PB2
diff --git a/src/main/target/SPRACINGF4NEO/target.h b/src/main/target/SPRACINGF4NEO/target.h
index d39043299..9f3df4bed 100644
--- a/src/main/target/SPRACINGF4NEO/target.h
+++ b/src/main/target/SPRACINGF4NEO/target.h
@@ -39,8 +39,7 @@
     #define LED1_PIN                        PB2
 #endif
 
-#define USE_BEEPER
-#define BEEPER_PIN                          PC15
+#define BEEPER                              PC15
 #define BEEPER_INVERTED
 
 #if (SPRACINGF4NEO_REV >= 2)
diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h
index d61a2e540..7670c647d 100644
--- a/src/main/target/STM32F3DISCOVERY/target.h
+++ b/src/main/target/STM32F3DISCOVERY/target.h
@@ -40,8 +40,7 @@
 #define LED1_PIN                PE10 // Orange LEDs - PE10/PE14
 #define LED1_INVERTED
 
-#define USE_BEEPER
-#define BEEPER_PIN              PD12
+#define BEEPER                  PD12
 #define BEEPER_PWM_HZ           2000  // Beeper PWM frequency in Hz
 
 #define USE_SPI
diff --git a/src/main/target/TINYFISH/target.h b/src/main/target/TINYFISH/target.h
index 792d63737..007fb20dd 100644
--- a/src/main/target/TINYFISH/target.h
+++ b/src/main/target/TINYFISH/target.h
@@ -25,8 +25,7 @@
 #define LED0_PIN                PC14
 #define LED1_PIN                PA13
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 
diff --git a/src/main/target/VRRACE/target.h b/src/main/target/VRRACE/target.h
index 3bd1aa886..2e20ee35c 100644
--- a/src/main/target/VRRACE/target.h
+++ b/src/main/target/VRRACE/target.h
@@ -23,8 +23,7 @@
 
 #define LED0_PIN PD14
 #define LED1_PIN PD15
-#define USE_BEEPER
-#define BEEPER_PIN PA0
+#define BEEPER PA0
 #define BEEPER_INVERTED
 
 #define INVERTER_PIN_UART6 PD7
diff --git a/src/main/target/WORMFC/target.h b/src/main/target/WORMFC/target.h
index 6639f9fb1..50586f267 100644
--- a/src/main/target/WORMFC/target.h
+++ b/src/main/target/WORMFC/target.h
@@ -25,8 +25,7 @@
 #define LED1_PIN                PC14
 
 //BEEPER
-#define USE_BEEPER
-#define BEEPER_PIN              PB14
+#define BEEPER                  PB14
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
diff --git a/src/main/target/X_RACERSPI/target.h b/src/main/target/X_RACERSPI/target.h
index c1b535a1a..2492c54dc 100644
--- a/src/main/target/X_RACERSPI/target.h
+++ b/src/main/target/X_RACERSPI/target.h
@@ -23,8 +23,7 @@
 
 
 #define LED0_PIN                PC14
-#define USE_BEEPER
-#define BEEPER_PIN              PC15
+#define BEEPER                  PC15
 #define BEEPER_INVERTED
 
 #define USE_MAG_DATA_READY_SIGNAL
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index a07af040c..78121f5eb 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -30,8 +30,7 @@
 //define camera control
 #define CAMERA_CONTROL_PIN      PB7 // Camera control
 
-#define USE_BEEPER
-#define BEEPER_PIN              PC9
+#define BEEPER                  PC9
 #define BEEPER_OPT              PB14
 #define BEEPER_PWM_HZ           3150 // Beeper PWM frequency in Hz
 
diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h
index 38ac0e818..4169a0666 100644
--- a/src/main/target/YUPIF7/target.h
+++ b/src/main/target/YUPIF7/target.h
@@ -25,8 +25,7 @@
 //define camera control
 #define CAMERA_CONTROL_PIN      PB7
 
-#define USE_BEEPER
-#define BEEPER_PIN              PB14
+#define BEEPER                  PB14
 #define BEEPER_PWM_HZ           3150 // Beeper PWM frequency in Hz
 
 // Gyro interrupt
diff --git a/src/test/unit/target.h b/src/test/unit/target.h
index 18209cb63..5e1507664 100644
--- a/src/test/unit/target.h
+++ b/src/test/unit/target.h
@@ -23,7 +23,7 @@
 #define USE_CMS
 #define CMS_MAX_DEVICE 4
 #define USE_FAKE_GYRO
-#define USE_BEEPER
+#define BEEPER
 #define USE_BLACKBOX
 #define USE_MAG
 #define USE_BARO