6 files changed, 18 insertions, 21 deletions
diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
index 648c3a88de..350245d1c3 100644
--- a/keyboards/kiwikey/borderland/config.h
+++ b/keyboards/kiwikey/borderland/config.h
@@ -5,13 +5,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID    0x4B57    // KW - KiwiKey
-#define PRODUCT_ID   0x424C    // BL - Borderland
-#define DEVICE_VER   0x0001
-#define MANUFACTURER KiwiKey
-#define PRODUCT      Borderland
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json
index c92df0521d..2123268c2e 100644
--- a/keyboards/kiwikey/borderland/info.json
+++ b/keyboards/kiwikey/borderland/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Borderland",
+    "manufacturer": "KiwiKey",
     "url": "https://kiwikey.vn/borderland/",
     "maintainer": "KiwiKey",
+    "usb": {
+        "vid": "0x4B57",
+        "pid": "0x424C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
index 59adcd253e..9f98ca1926 100644
--- a/keyboards/kiwikey/kawii9/config.h
+++ b/keyboards/kiwikey/kawii9/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    0x4B57    // KW - KiwiKey
-#define PRODUCT_ID   0x0303    // 3x3
-#define DEVICE_VER   0x0002
-#define MANUFACTURER KiwiKey
-#define PRODUCT      Kawii9
-
 /* key matrix size */
 #define MATRIX_ROWS 3
 #define MATRIX_COLS 3
diff --git a/keyboards/kiwikey/kawii9/info.json b/keyboards/kiwikey/kawii9/info.json
index 367f402f7b..ad8ae3679a 100644
--- a/keyboards/kiwikey/kawii9/info.json
+++ b/keyboards/kiwikey/kawii9/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Kawii9",
+    "manufacturer": "KiwiKey",
     "url": "http://kiwikey.vn/kawii9/",
     "maintainer": "KiwiKey",
+    "usb": {
+        "vid": "0x4B57",
+        "pid": "0x0303",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_ortho_3x3": {
             "layout": [
diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
index e0b9ba8946..4107d5717a 100644
--- a/keyboards/kiwikey/wanderland/config.h
+++ b/keyboards/kiwikey/wanderland/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    0x4B57    // KW - KiwiKey
-#define PRODUCT_ID   0x574C    // WL - Wanderland
-#define DEVICE_VER   0x0001
-#define MANUFACTURER KiwiKey
-#define PRODUCT      Wanderland
-
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 13
diff --git a/keyboards/kiwikey/wanderland/info.json b/keyboards/kiwikey/wanderland/info.json
index 01196c3418..92dfb2fff6 100644
--- a/keyboards/kiwikey/wanderland/info.json
+++ b/keyboards/kiwikey/wanderland/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Wanderland",
+    "manufacturer": "KiwiKey",
     "url": "http://kiwikey.vn/wanderland",
     "maintainer": "KiwiKey",
+    "usb": {
+        "vid": "0x4B57",
+        "pid": "0x574C",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_alice_split_bs": {
             "layout": [