diff --git a/keyboards/nora/v01/config.h b/keyboards/nora/v01/config.h
index 9f5798491bce..ac9fca7bd3ae 100644
--- a/keyboards/nora/v01/config.h
+++ b/keyboards/nora/v01/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// Same pins for Round-Robin matrix.
-#define MATRIX_ROW_PINS { F1, B7, D2, F6, F7, B0, F4, F5, C7, B6 }
-#define MATRIX_COL_PINS { F0, D3, D5, D4, D6, D7, B4, B5 }
-#define DIODE_DIRECTION COL2ROW
-
 /* RGBLIGHT */
   #define RGBLED_NUM 16
   #define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/nora/v01/info.json b/keyboards/nora/v01/info.json
index 00fa2b7a87ee..3efbf3fadc12 100644
--- a/keyboards/nora/v01/info.json
+++ b/keyboards/nora/v01/info.json
@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["F0", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+        "rows": ["F1", "B7", "D2", "F6", "F7", "B0", "F4", "F5", "C7", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/nora/v03/config.h b/keyboards/nora/v03/config.h
index e9f2c52345c0..6555434c5256 100644
--- a/keyboards/nora/v03/config.h
+++ b/keyboards/nora/v03/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// Same pins for Round-Robin matrix.
-#define MATRIX_ROW_PINS { D3, D2, D7, B7, F1, D5, D4, D6, B4, F0 }
-#define MATRIX_COL_PINS { B0, C7, B6, B5, F7, F6, F5, F4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* RGBLIGHT */
 #ifdef RGB_MATRIX_ENABLE
   #define RGB_MATRIX_LED_COUNT 71
diff --git a/keyboards/nora/v03/info.json b/keyboards/nora/v03/info.json
index bdc8d2e1a5c7..079c1a90042c 100644
--- a/keyboards/nora/v03/info.json
+++ b/keyboards/nora/v03/info.json
@@ -8,6 +8,11 @@
         "pid": "0xC9D7",
         "device_version": "0.3.0"
     },
+    "matrix_pins": {
+        "cols": ["B0", "C7", "B6", "B5", "F7", "F6", "F5", "F4"],
+        "rows": ["D3", "D2", "D7", "B7", "F1", "D5", "D4", "D6", "B4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "ws2812": {
diff --git a/keyboards/nora/v031/config.h b/keyboards/nora/v031/config.h
index 55128654c746..dab9e4579f83 100644
--- a/keyboards/nora/v031/config.h
+++ b/keyboards/nora/v031/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// Same pins for Round-Robin matrix.
-#define MATRIX_ROW_PINS { D3, D2, D7, B7, F1, D5, D4, D6, B4, F0 }
-#define MATRIX_COL_PINS { B0, C7, B6, B5, F7, F6, F5, F4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Rotary Encoder */
 #ifdef ENCODER_ENABLE
 // Encoder triggers specific key matrix position,
diff --git a/keyboards/nora/v031/info.json b/keyboards/nora/v031/info.json
index 6251174bfe23..9e4e9a822589 100644
--- a/keyboards/nora/v031/info.json
+++ b/keyboards/nora/v031/info.json
@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["B0", "C7", "B6", "B5", "F7", "F6", "F5", "F4"],
+        "rows": ["D3", "D2", "D7", "B7", "F1", "D5", "D4", "D6", "B4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "ws2812": {
         "pin": "E6"
     },
diff --git a/keyboards/nora/v1/config.h b/keyboards/nora/v1/config.h
index cdd29f207c6d..69a222119668 100644
--- a/keyboards/nora/v1/config.h
+++ b/keyboards/nora/v1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-// Same pins for Round-Robin matrix.
-#define MATRIX_ROW_PINS { D3, D2, D7, B7, F1, D5, D4, D6, B4, F0 }
-#define MATRIX_COL_PINS { B0, C7, B6, B5, F7, F6, F5, F4 }
-#define DIODE_DIRECTION COL2ROW
-
 /* Rotary Encoder */
 #ifdef ENCODER_ENABLE
 // Encoder triggers specific key matrix position,
diff --git a/keyboards/nora/v1/info.json b/keyboards/nora/v1/info.json
index 8f3a35933c7f..84853e2ad7af 100644
--- a/keyboards/nora/v1/info.json
+++ b/keyboards/nora/v1/info.json
@@ -10,6 +10,11 @@
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "cols": ["B0", "C7", "B6", "B5", "F7", "F6", "F5", "F4"],
+        "rows": ["D3", "D2", "D7", "B7", "F1", "D5", "D4", "D6", "B4", "F0"]
+    },
+    "diode_direction": "COL2ROW",
     "ws2812": {
         "pin": "E6"
     },