diff --git a/configs/defconfig.common b/configs/defconfig.common
index 48baf508..2d50cdac 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -125,7 +125,6 @@ CONFIG_I2S_ISR_IRAM_SAFE=y
 # Matter Settings
 #
 # Disable Matter BLE
-CONFIG_ENABLE_CHIPOBLE=n
 CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
 # ESP Insights
 CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index db01aeab..63bec306 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -20,3 +20,6 @@ CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
 CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=n
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index 804a908f..d860aed2 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -12,3 +12,6 @@ CONFIG_ESP_WIFI_SCAN_CACHE=y
 CONFIG_ESP_WIFI_MBO_SUPPORT=y
 CONFIG_ESP_WIFI_11R_SUPPORT=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=4096
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=y
diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5
index b18dd4b0..7f936c4f 100644
--- a/configs/defconfig.esp32c5
+++ b/configs/defconfig.esp32c5
@@ -50,8 +50,12 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
-# Matter shall use only WiFi
-CONFIG_ENABLE_MATTER_OVER_THREAD=n
+# Matter settings: WiFi and OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Set endpoint id for Thread and Wi-Fi, depending on the secondary network interface endpoint id.
+CONFIG_THREAD_NETWORK_ENDPOINT_ID=2
+CONFIG_WIFI_NETWORK_ENDPOINT_ID=0
 
 #
 # Zigbee
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
index ce5cb19e..0994f0d8 100644
--- a/configs/defconfig.esp32c6
+++ b/configs/defconfig.esp32c6
@@ -44,8 +44,12 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
-# Matter shall use only WiFi
-CONFIG_ENABLE_MATTER_OVER_THREAD=n
+# Matter settings: WiFi and OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Set endpoint id for Thread and Wi-Fi, depending on the secondary network interface endpoint id.
+CONFIG_THREAD_NETWORK_ENDPOINT_ID=2
+CONFIG_WIFI_NETWORK_ENDPOINT_ID=0
 
 #
 # Zigbee
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
index 25e757de..89bec306 100644
--- a/configs/defconfig.esp32h2
+++ b/configs/defconfig.esp32h2
@@ -40,6 +40,13 @@ CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
 
+# Matter settings: OpenThread + CHIPoBLE
+CONFIG_ENABLE_CHIPOBLE=y
+CONFIG_ENABLE_MATTER_OVER_THREAD=y
+# Disable Matter over WiFi
+CONFIG_ENABLE_WIFI_AP=n
+CONFIG_ENABLE_WIFI_STATION=n
+
 #
 # Zigbee
 #
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index 3b0af548..f90b0fab 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -15,3 +15,6 @@ CONFIG_ULP_COPROC_ENABLED=y
 CONFIG_ULP_COPROC_TYPE_FSM=y
 # CONFIG_ULP_COPROC_TYPE_RISCV=y
 CONFIG_ULP_COPROC_RESERVE_MEM=512
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=n
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 08e9d95c..2de36882 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -26,3 +26,6 @@ CONFIG_ULP_COPROC_RESERVE_MEM=512
 # RGB Display Optimizations
 # CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set
 CONFIG_LCD_RGB_RESTART_IN_VSYNC=y
+
+# Matter settings:
+CONFIG_ENABLE_CHIPOBLE=y
diff --git a/main/idf_component.yml b/main/idf_component.yml
index a85eca54..4ba96d85 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -20,4 +20,4 @@ dependencies:
     version: "1.4.1"
     require: public
     rules:
-      - if: "target not in [esp32c2, esp32h2, esp32p4]"
+      - if: "target not in [esp32c2, esp32p4]"