diff --git a/app/Kconfig b/app/Kconfig
index f4860210..f5d92a88 100644
--- a/app/Kconfig
+++ b/app/Kconfig
@@ -361,6 +361,9 @@ config KERNEL_BIN_NAME
 config REBOOT
 	default y
 
+config USB
+	default y if HAS_HW_NRF_USBD
+
 module = ZMK
 module-str = zmk
 source "subsys/logging/Kconfig.template.log_config"
diff --git a/app/boards/shields/bfo9000/Kconfig.defconfig b/app/boards/shields/bfo9000/Kconfig.defconfig
index 1251113f..a8584886 100644
--- a/app/boards/shields/bfo9000/Kconfig.defconfig
+++ b/app/boards/shields/bfo9000/Kconfig.defconfig
@@ -16,9 +16,6 @@ if SHIELD_BFO9000_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "BFO9000 Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_BFO9000_LEFT || SHIELD_BFO9000_RIGHT
diff --git a/app/boards/shields/corne/Kconfig.defconfig b/app/boards/shields/corne/Kconfig.defconfig
index 6cf60b18..ef4817b5 100644
--- a/app/boards/shields/corne/Kconfig.defconfig
+++ b/app/boards/shields/corne/Kconfig.defconfig
@@ -12,9 +12,6 @@ if SHIELD_CORNE_RIGHT
 
 config ZMK_KEYBOARD_NAME
 	default "Corne Right"
-
-config USB
-	default y
 	
 endif
 
diff --git a/app/boards/shields/cradio/Kconfig.defconfig b/app/boards/shields/cradio/Kconfig.defconfig
index 25bb4331..5e826bf0 100644
--- a/app/boards/shields/cradio/Kconfig.defconfig
+++ b/app/boards/shields/cradio/Kconfig.defconfig
@@ -16,9 +16,6 @@ if SHIELD_CRADIO_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "cradio right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_CRADIO_LEFT || SHIELD_CRADIO_RIGHT
diff --git a/app/boards/shields/helix/Kconfig.defconfig b/app/boards/shields/helix/Kconfig.defconfig
index f58684a8..f0a4f880 100644
--- a/app/boards/shields/helix/Kconfig.defconfig
+++ b/app/boards/shields/helix/Kconfig.defconfig
@@ -16,9 +16,6 @@ if SHIELD_HELIX_RIGHT
 config ZMK_KEYBOARD_NAME
     default "Helix Right"
 
-config USB
-    default y
-
 endif
 
 if SHIELD_HELIX_LEFT || SHIELD_HELIX_RIGHT
diff --git a/app/boards/shields/iris/Kconfig.defconfig b/app/boards/shields/iris/Kconfig.defconfig
index a43c0073..57b8c1ee 100644
--- a/app/boards/shields/iris/Kconfig.defconfig
+++ b/app/boards/shields/iris/Kconfig.defconfig
@@ -16,9 +16,6 @@ if SHIELD_IRIS_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "Iris Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_IRIS_LEFT || SHIELD_IRIS_RIGHT
diff --git a/app/boards/shields/jian/Kconfig.defconfig b/app/boards/shields/jian/Kconfig.defconfig
index 07023a24..fc1f1995 100644
--- a/app/boards/shields/jian/Kconfig.defconfig
+++ b/app/boards/shields/jian/Kconfig.defconfig
@@ -14,9 +14,6 @@ if SHIELD_JIAN_RIGHT
 
 config ZMK_KEYBOARD_NAME
 	default "Jian Right"
-
-config USB
-	default y
 	
 endif
 
diff --git a/app/boards/shields/jorne/Kconfig.defconfig b/app/boards/shields/jorne/Kconfig.defconfig
index 18dcabe1..860cb12f 100644
--- a/app/boards/shields/jorne/Kconfig.defconfig
+++ b/app/boards/shields/jorne/Kconfig.defconfig
@@ -14,9 +14,6 @@ if SHIELD_JORNE_RIGHT
 
 config ZMK_KEYBOARD_NAME
 	default "Jorne Right"
-
-config USB
-	default y
 	
 endif
 
diff --git a/app/boards/shields/kyria/Kconfig.defconfig b/app/boards/shields/kyria/Kconfig.defconfig
index d0c17105..99e47bfe 100644
--- a/app/boards/shields/kyria/Kconfig.defconfig
+++ b/app/boards/shields/kyria/Kconfig.defconfig
@@ -15,9 +15,6 @@ if SHIELD_KYRIA_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "Kyria Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_KYRIA_LEFT || SHIELD_KYRIA_RIGHT
diff --git a/app/boards/shields/lily58/Kconfig.defconfig b/app/boards/shields/lily58/Kconfig.defconfig
index ebcfa7b7..915cc70e 100644
--- a/app/boards/shields/lily58/Kconfig.defconfig
+++ b/app/boards/shields/lily58/Kconfig.defconfig
@@ -14,9 +14,6 @@ if SHIELD_LILY58_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "Lily58 Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_LILY58_LEFT || SHIELD_LILY58_RIGHT
diff --git a/app/boards/shields/microdox/Kconfig.defconfig b/app/boards/shields/microdox/Kconfig.defconfig
index 0afd7491..be39c9f8 100644
--- a/app/boards/shields/microdox/Kconfig.defconfig
+++ b/app/boards/shields/microdox/Kconfig.defconfig
@@ -17,9 +17,6 @@ if SHIELD_MICRODOX_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "Microdox Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_MICRODOX_LEFT || SHIELD_MICRODOX_RIGHT
diff --git a/app/boards/shields/quefrency/Kconfig.defconfig b/app/boards/shields/quefrency/Kconfig.defconfig
index 5a7d964a..de44702f 100644
--- a/app/boards/shields/quefrency/Kconfig.defconfig
+++ b/app/boards/shields/quefrency/Kconfig.defconfig
@@ -17,9 +17,6 @@ if SHIELD_QUEFRENCY_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "Quefrency Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_QUEFRENCY_LEFT || SHIELD_QUEFRENCY_RIGHT
diff --git a/app/boards/shields/sofle/Kconfig.defconfig b/app/boards/shields/sofle/Kconfig.defconfig
index 765afea4..6a580bfe 100644
--- a/app/boards/shields/sofle/Kconfig.defconfig
+++ b/app/boards/shields/sofle/Kconfig.defconfig
@@ -16,9 +16,6 @@ if SHIELD_SOFLE_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "Sofle Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_SOFLE_LEFT || SHIELD_SOFLE_RIGHT
diff --git a/app/boards/shields/splitreus62/Kconfig.defconfig b/app/boards/shields/splitreus62/Kconfig.defconfig
index 26c2e937..fdaa3779 100644
--- a/app/boards/shields/splitreus62/Kconfig.defconfig
+++ b/app/boards/shields/splitreus62/Kconfig.defconfig
@@ -18,9 +18,6 @@ if SHIELD_SPLITREUS62_RIGHT
 config ZMK_KEYBOARD_NAME
 	default "Splitreus62 Right"
 
-config USB
-	default y
-
 endif
 
 if SHIELD_SPLITREUS62_LEFT || SHIELD_SPLITREUS62_RIGHT