diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c76e45a6..c8a88b06 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4, esp32c5]
+        target: [esp32c5]
       fail-fast: false
     steps:
     - name: Checkout repository
diff --git a/build.sh b/build.sh
index 50e376c2..40c484ce 100755
--- a/build.sh
+++ b/build.sh
@@ -20,7 +20,7 @@ export IDF_COMPONENT_OVERWRITE_MANAGED_COMPONENTS=1
 
 CCACHE_ENABLE=1
 
-TARGET="all"
+TARGET="esp32c5"
 BUILD_TYPE="all"
 BUILD_DEBUG="default"
 SKIP_ENV=0
diff --git a/configs/defconfig.common b/configs/defconfig.common
index 48baf508..6e0f0c93 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -125,12 +125,14 @@ CONFIG_I2S_ISR_IRAM_SAFE=y
 # Matter Settings
 #
 # Disable Matter BLE
-CONFIG_ENABLE_CHIPOBLE=n
+# CONFIG_ENABLE_CHIPOBLE=n
 CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
 # ESP Insights
 CONFIG_ENABLE_ESP_INSIGHTS_TRACE=n
 # Use compact attribute storage mode
 CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
+# Do not use minimal mDNS within Matter Core
+CONFIG_USE_MINIMAL_MDNS=n
 
 #TinyUSB Config
 CONFIG_TINYUSB_CDC_MAX_PORTS=2
diff --git a/configs/defconfig.esp32c5 b/configs/defconfig.esp32c5
index b18dd4b0..4eaa5d56 100644
--- a/configs/defconfig.esp32c5
+++ b/configs/defconfig.esp32c5
@@ -50,9 +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/main/idf_component.yml b/main/idf_component.yml
index a85eca54..2d4aa68b 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, esp32h2, esp32, esp32c3, esp32s2, esp32s3, esp32c6, esp32p4]"