diff --git a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
index dadaacf3b2..f075ea1f6c 100644
--- a/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32s2/include/soc/Kconfig.soc_caps.in
@@ -719,9 +719,9 @@ config SOC_SPIRAM_SUPPORTED
     bool
     default y
 
-config SOC_USB_PERIPH_NUM
-    bool
-    default y
+config SOC_USB_OTG_PERIPH_NUM
+    int
+    default 1
 
 config SOC_SHA_DMA_MAX_BUFFER_SIZE
     int
diff --git a/components/soc/esp32s2/include/soc/soc_caps.h b/components/soc/esp32s2/include/soc/soc_caps.h
index 6e741f1648..0d2c0b6e2a 100644
--- a/components/soc/esp32s2/include/soc/soc_caps.h
+++ b/components/soc/esp32s2/include/soc/soc_caps.h
@@ -320,8 +320,7 @@
 #define SOC_SPIRAM_SUPPORTED    1
 
 /*-------------------------- USB CAPS ----------------------------------------*/
-#define SOC_USB_PERIPH_NUM 1
-
+#define SOC_USB_OTG_PERIPH_NUM          (1U)
 
 /*--------------------------- SHA CAPS ---------------------------------------*/
 /* Max amount of bytes in a single DMA operation is 4095,
diff --git a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
index ae61e74b38..5725c27131 100644
--- a/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
@@ -815,9 +815,9 @@ config SOC_UART_REQUIRE_CORE_RESET
     bool
     default y
 
-config SOC_USB_PERIPH_NUM
-    bool
-    default y
+config SOC_USB_OTG_PERIPH_NUM
+    int
+    default 1
 
 config SOC_SHA_DMA_MAX_BUFFER_SIZE
     int
diff --git a/components/soc/esp32s3/include/soc/soc_caps.h b/components/soc/esp32s3/include/soc/soc_caps.h
index 93adb5ad50..33fc88c9d6 100644
--- a/components/soc/esp32s3/include/soc/soc_caps.h
+++ b/components/soc/esp32s3/include/soc/soc_caps.h
@@ -333,7 +333,7 @@
 #define SOC_UART_REQUIRE_CORE_RESET (1)
 
 /*-------------------------- USB CAPS ----------------------------------------*/
-#define SOC_USB_PERIPH_NUM 1
+#define SOC_USB_OTG_PERIPH_NUM          (1U)
 
 
 /*--------------------------- SHA CAPS ---------------------------------------*/
diff --git a/examples/peripherals/.build-test-rules.yml b/examples/peripherals/.build-test-rules.yml
index 1e7fc00b5c..4d881f3284 100644
--- a/examples/peripherals/.build-test-rules.yml
+++ b/examples/peripherals/.build-test-rules.yml
@@ -191,7 +191,7 @@ examples/peripherals/uart/uart_echo_rs485:
 
 examples/peripherals/usb:
   disable:
-    - if: SOC_USB_PERIPH_NUM != 1
+    - if: SOC_USB_OTG_SUPPORTED != 1
 
 examples/peripherals/wave_gen:
   enable:
diff --git a/examples/system/.build-test-rules.yml b/examples/system/.build-test-rules.yml
index 1c5a0a9cd5..215a086185 100644
--- a/examples/system/.build-test-rules.yml
+++ b/examples/system/.build-test-rules.yml
@@ -22,7 +22,10 @@ examples/system/console/advanced:
 
 examples/system/console/advanced_usb_cdc:
   disable:
-    - if: SOC_USB_PERIPH_NUM == 0
+    - if: SOC_USB_OTG_SUPPORTED != 1
+  depends_components:
+    - console
+    - vfs
 
 examples/system/console/basic:
   disable: