4 files changed, 12 insertions, 13 deletions
diff --git a/keyboards/boardsource/holiday/spooky/config.h b/keyboards/boardsource/holiday/spooky/config.h
index 87d63b0d9e..e2c0600a10 100644
--- a/keyboards/boardsource/holiday/spooky/config.h
+++ b/keyboards/boardsource/holiday/spooky/config.h
@@ -19,13 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4273
-#define PRODUCT_ID   0x1031
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Boardsource
-#define PRODUCT      spooky
-
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 3
diff --git a/keyboards/boardsource/holiday/spooky/info.json b/keyboards/boardsource/holiday/spooky/info.json
index c942b2af11..b8964d881e 100644
--- a/keyboards/boardsource/holiday/spooky/info.json
+++ b/keyboards/boardsource/holiday/spooky/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "spooky",
+    "manufacturer": "Boardsource",
     "url": "https://boardsource.xyz/store/5f783f6da2c1b43e37ca0795",
     "maintainer": "boardsource",
+    "usb": {
+        "vid": "0x4273",
+        "pid": "0x1031",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_ortho_2x3": {
             "layout": [
diff --git a/keyboards/boardsource/lulu/config.h b/keyboards/boardsource/lulu/config.h
index 8cd240179e..d4fea42b33 100644
--- a/keyboards/boardsource/lulu/config.h
+++ b/keyboards/boardsource/lulu/config.h
@@ -5,12 +5,6 @@
 
 #include "config_common.h"
 
-#define VENDOR_ID       0x4273
-#define PRODUCT_ID      0x7685
-#define DEVICE_VER      0x0000
-#define MANUFACTURER    Boardsource
-#define PRODUCT         lulu
-
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6
 #define MATRIX_ROW_PINS {C6, D7, E6, B4, B5}
diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
index 156a7cea98..4cfc688740 100644
--- a/keyboards/boardsource/lulu/info.json
+++ b/keyboards/boardsource/lulu/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Lulu",
+    "manufacturer": "Boardsource",
     "url": "https://boardsource.xyz/store/61d0b772319a1f3cc53ba2fb",
     "maintainer": "boardsource",
+    "usb": {
+        "vid": "0x4273",
+        "pid": "0x7685",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [