4 files changed, 13 insertions, 14 deletions
diff --git a/keyboards/tkw/stoutgat/v1/config.h b/keyboards/tkw/stoutgat/v1/config.h
index 96471e443d..69de5208c6 100644
--- a/keyboards/tkw/stoutgat/v1/config.h
+++ b/keyboards/tkw/stoutgat/v1/config.h
@@ -18,12 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x7811
-#define DEVICE_VER 0x0001
-#define MANUFACTURER TKW
-#define PRODUCT stoutgat
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/tkw/stoutgat/v1/info.json b/keyboards/tkw/stoutgat/v1/info.json
index d649a48b5b..22be9b3ae2 100644
--- a/keyboards/tkw/stoutgat/v1/info.json
+++ b/keyboards/tkw/stoutgat/v1/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "stoutgat",
+    "manufacturer": "TKW",
     "url": "https://github.com/vattern/stoutgat",
     "maintainer": "vattern",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x7811",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_encoder": {
             "layout": [
diff --git a/keyboards/tkw/stoutgat/v2/config.h b/keyboards/tkw/stoutgat/v2/config.h
index 73b3eef90b..989cc1a76e 100644
--- a/keyboards/tkw/stoutgat/v2/config.h
+++ b/keyboards/tkw/stoutgat/v2/config.h
@@ -17,13 +17,6 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x7811
-#define DEVICE_VER 0x0002
-#define MANUFACTURER TKW
-#define PRODUCT Stoutgat v2 65%
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
diff --git a/keyboards/tkw/stoutgat/v2/info.json b/keyboards/tkw/stoutgat/v2/info.json
index 6946e3e0bc..bafe4d6fc1 100644
--- a/keyboards/tkw/stoutgat/v2/info.json
+++ b/keyboards/tkw/stoutgat/v2/info.json
@@ -1,7 +1,13 @@
 {
-    "keyboard_name": "stoutgat/v2",
+    "keyboard_name": "Stoutgat v2 65%",
+    "manufacturer": "TKW",
     "url": "https://github.com/vattern/stoutgatv2",
     "maintainer": "vattern",
+    "usb": {
+        "vid": "0xFEED",
+        "pid": "0x7811",
+        "device_version": "0.0.2"
+    },
     "layouts": {
         "LAYOUT_encoder": {
             "layout": [