6 files changed, 11 insertions, 9 deletions
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index 79eb536d14..8e572338d6 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -54,7 +54,6 @@
 #define RGBLIGHT_VAL_STEP 8
 
 //pin setting
-#define LED_CAPS_LOCK_PIN E2
 #define LED_POWER_PIN       D5
 #define CHG_EN_PIN          E6
 #define BATTERY_LEVEL_PIN   F0
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index b5f58bc26c..e52ffa1c74 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -8,6 +8,9 @@
         "pid": "0x474E",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "E2"
+    },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "community_layouts": ["60_hhkb"],
diff --git a/keyboards/matrix/m12og/rev1/config.h b/keyboards/matrix/m12og/rev1/config.h
index cf109f852e..7388b0ccd8 100644
--- a/keyboards/matrix/m12og/rev1/config.h
+++ b/keyboards/matrix/m12og/rev1/config.h
@@ -30,10 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/* Status LEDs */
-#define LED_CAPS_LOCK_PIN B6
-#define LED_SCROLL_LOCK_PIN B5
-
 /* RGB */
 #define RGB_DI_PIN B8
 #define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/matrix/m12og/rev1/info.json b/keyboards/matrix/m12og/rev1/info.json
index 3406beab76..434b28fbf2 100644
--- a/keyboards/matrix/m12og/rev1/info.json
+++ b/keyboards/matrix/m12og/rev1/info.json
@@ -8,6 +8,10 @@
         "pid": "0x0369",
         "device_version": "0.0.1"
     },
+    "indicators": {
+        "caps_lock": "B6",
+        "scroll_lock": "B5"
+    },
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/matrix/me/config.h b/keyboards/matrix/me/config.h
index 7291a6dcbc..3bc1753d64 100644
--- a/keyboards/matrix/me/config.h
+++ b/keyboards/matrix/me/config.h
@@ -50,7 +50,3 @@
 #define RGBLIGHT_HUE_STEP   8
 #define RGBLIGHT_SAT_STEP   8
 #define RGBLIGHT_VAL_STEP   8
-
-// led pins
-#define LED_CAPS_LOCK_PIN   E6
-#define LED_SCROLL_LOCK_PIN D2
diff --git a/keyboards/matrix/me/info.json b/keyboards/matrix/me/info.json
index e99f6f4146..cfe0ad22d4 100644
--- a/keyboards/matrix/me/info.json
+++ b/keyboards/matrix/me/info.json
@@ -8,6 +8,10 @@
     "pid": "0x454D",
     "device_version": "0.0.1"
   },
+  "indicators": {
+    "caps_lock": "E6",
+    "scroll_lock": "D2"
+  },
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {