diff --git a/app/Kconfig b/app/Kconfig
index 2e6c813706c8..e613e812e494 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -16,9 +16,27 @@ config USB_DEVICE_PRODUCT
 config BT_DEVICE_NAME
     default ZMK_KEYBOARD_NAME
 
+config USB_DEVICE_VID
+    default 0x1D50
+
+config USB_DEVICE_PID
+    default 0x615E
+
+config USB_DEVICE_MANUFACTURER
+    default "ZMK Project"
+
+config BT_DIS_PNP_VID
+    default 0x1D50
+
+config BT_DIS_PNP_PID
+    default 0x615E
+
 config BT_DIS_MODEL
     default ZMK_KEYBOARD_NAME
 
+config BT_DIS_MANUF
+    default "ZMK Project"
+
 # Hardware specific overrides
 
 if SOC_SERIES_NRF52X
diff --git a/app/Kconfig.defaults b/app/Kconfig.defaults
index 1c49161db0d7..43c30d7318e1 100644
--- a/app/Kconfig.defaults
+++ b/app/Kconfig.defaults
@@ -1,27 +1,6 @@
 # Copyright (c) 2024 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-# Basic Keyboard Setup
-
-# IDs can be overridden if vendor obtains a USB VID
-config USB_DEVICE_VID
-    default 0x1D50
-
-config USB_DEVICE_PID
-    default 0x615E
-
-config USB_DEVICE_MANUFACTURER
-    default "ZMK Project"
-
-config BT_DIS_PNP_VID
-    default 0x1D50
-
-config BT_DIS_PNP_PID
-    default 0x615E
-
-config BT_DIS_MANUF
-    default "ZMK Project"
-
 # HID
 if ZMK_HID_REPORT_TYPE_HKRO