diff --git a/docs/config_options.md b/docs/config_options.md
index 91c17cf09d7..95cc89eaa7e 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -74,24 +74,6 @@ This is a C header file that is one of the first things included, and will persi
   * pins mapped to rows and columns, from left to right. Defines a matrix where each switch is connected to a separate pin and ground.
 * `#define AUDIO_VOICES`
   * turns on the alternate audio voices (to cycle through)
-* `#define C4_AUDIO`
-  * enables audio on pin C4
-  * Deprecated. Use `#define AUDIO_PIN C4`
-* `#define C5_AUDIO`
-  * enables audio on pin C5
-  * Deprecated. Use `#define AUDIO_PIN C5`
-* `#define C6_AUDIO`
-  * enables audio on pin C6
-  * Deprecated. Use `#define AUDIO_PIN C6`
-* `#define B5_AUDIO`
-  * enables audio on pin B5 (duophony is enabled if one of B pins is enabled along with one of C pins)
-  * Deprecated. Use `#define AUDIO_PIN B5`, or use `#define AUDIO_PIN_ALT B5` if a `C` pin is enabled with `AUDIO_PIN`
-* `#define B6_AUDIO`
-  * enables audio on pin B6 (duophony is enabled if one of B pins is enabled along with one of C pins)
-  * Deprecated. Use `#define AUDIO_PIN B6`, or use `#define AUDIO_PIN_ALT B6` if a `C` pin is enabled with `AUDIO_PIN`
-* `#define B7_AUDIO`
-  * enables audio on pin B7 (duophony is enabled if one of B pins is enabled along with one of C pins)
-  * Deprecated. Use `#define AUDIO_PIN B7`, or use `#define AUDIO_PIN_ALT B7` if a `C` pin is enabled with `AUDIO_PIN`
 * `#define BACKLIGHT_PIN B7`
   * pin of the backlight
 * `#define BACKLIGHT_LEVELS 3`
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index 97281151068..5841bd563cf 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define B7_AUDIO
+#define AUDIO_PIN B7
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index 97281151068..5841bd563cf 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define B7_AUDIO
+#define AUDIO_PIN B7
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
diff --git a/keyboards/latincompass/latin6rgb/config.h b/keyboards/latincompass/latin6rgb/config.h
index 6b159751008..ac1aec51bb2 100644
--- a/keyboards/latincompass/latin6rgb/config.h
+++ b/keyboards/latincompass/latin6rgb/config.h
@@ -19,4 +19,4 @@
 
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 
-#define B7_AUDIO
+#define AUDIO_PIN B7
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index 5f999594cf2..d8e896c14b4 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -19,7 +19,7 @@
 #define SPLIT_USB_DETECT
 #define SPLIT_MODS_ENABLE
 
-#define B6_AUDIO
+#define AUDIO_PIN B6
 
 #ifdef AUDIO_ENABLE
   #define STARTUP_SONG SONG(STARTUP_SOUND)
diff --git a/keyboards/nightly_boards/n60_s/config.h b/keyboards/nightly_boards/n60_s/config.h
index 9e3016e53a4..0f3c9b68149 100644
--- a/keyboards/nightly_boards/n60_s/config.h
+++ b/keyboards/nightly_boards/n60_s/config.h
@@ -18,6 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* Audio */
-
-#define B7_AUDIO
+#define AUDIO_PIN B7
 #define AUDIO_CLICKY
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index c51480804b4..25f9928621f 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -420,19 +420,6 @@ def _extract_direct_matrix(direct_pins):
     return direct_pin_array
 
 
-def _extract_audio(info_data, config_c):
-    """Populate data about the audio configuration
-    """
-    audio_pins = []
-
-    for pin in 'B5', 'B6', 'B7', 'C4', 'C5', 'C6':
-        if config_c.get(f'{pin}_AUDIO'):
-            audio_pins.append(pin)
-
-    if audio_pins:
-        info_data['audio'] = {'pins': audio_pins}
-
-
 def _extract_encoders_values(config_c, postfix=''):
     """Common encoder extraction logic
     """
@@ -718,7 +705,6 @@ def _extract_config_h(info_data, config_c):
 
     # Pull data that easily can't be mapped in json
     _extract_matrix_info(info_data, config_c)
-    _extract_audio(info_data, config_c)
     _extract_secure_unlock(info_data, config_c)
     _extract_split_handedness(info_data, config_c)
     _extract_split_serial(info_data, config_c)