6 files changed, 9 insertions, 11 deletions
diff --git a/keyboards/handwired/ddg_56/config.h b/keyboards/handwired/ddg_56/config.h
index 7582367f13..a9b3c12ef2 100644
--- a/keyboards/handwired/ddg_56/config.h
+++ b/keyboards/handwired/ddg_56/config.h
@@ -20,7 +20,5 @@
 #define MATRIX_ROW_PINS { B5, B15, B9, B10, A14 }
 #define MATRIX_COL_PINS { A2, B8, B13, B14, B4, B11, B12, A13, A15, A8, A7, A6, B0, B1 }
 
-#define QMK_SPEAKER A5
-
 #define ENCODERS_PAD_A { A1, B3 }
 #define ENCODERS_PAD_B { A0, B2 }
diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h
index c8a121fb44..9a1af0d614 100644
--- a/keyboards/handwired/jotpad16/config.h
+++ b/keyboards/handwired/jotpad16/config.h
@@ -9,7 +9,6 @@
 #define JOTPAD16_LEDS
 #define JOTPAD16_LED1 B5
 #define JOTPAD16_LED2 B4
-#define QMK_LED B5
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h
index 4d6195c3c4..a3693706d4 100644
--- a/keyboards/handwired/p65rgb/config.h
+++ b/keyboards/handwired/p65rgb/config.h
@@ -86,6 +86,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define QMK_ESC_OUTPUT E6 // usually COL
-#define QMK_ESC_INPUT C7 // usually ROW
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json
index 1b8e87a2c8..316fa0f61d 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/info.json
@@ -8,6 +8,10 @@
         "pid": "0x75B4",
         "device_version": "0.0.1"
     },
+    "qmk_lufa_bootloader": {
+        "esc_input": "C7",
+        "esc_output": "E6"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "layouts": {
diff --git a/keyboards/handwired/rs60/config.h b/keyboards/handwired/rs60/config.h
index a4aa91b497..b9bf17a4a0 100644
--- a/keyboards/handwired/rs60/config.h
+++ b/keyboards/handwired/rs60/config.h
@@ -20,11 +20,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { B5, B6, B4, B2, E6 }
 #define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3,  F4, F5, F6, F7, B1, B3}
 
-#define QMK_ESC_OUTPUT C6
-#define QMK_ESC_INPUT  B4
-#define QMK_LED        B0
-// #define QMK_SPEAKER    C6
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json
index c96c1da1a3..ddd2cff353 100644
--- a/keyboards/handwired/rs60/info.json
+++ b/keyboards/handwired/rs60/info.json
@@ -8,6 +8,11 @@
         "pid": "0x4260",
         "device_version": "0.0.1"
     },
+    "qmk_lufa_bootloader": {
+        "esc_input": "B4",
+        "esc_output": "C6",
+        "led": "B0"
+    },
     "processor": "atmega32u4",
     "bootloader": "qmk-dfu",
     "community_layouts": ["ortho_5x12"],