diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..3288c66e8
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,47 @@
+# Changelog for esp_matter component registry
+
+## [1.4.2](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.2)
+
+#### Features
+
+- Component based on Matter 1.4.2
+- esp-matter commit: 157245702e8961caead5b13286d7a6589d1c485b
+- connectedhomeip commit: 320b9a6f6c49cc3877701bbdc1e631edf32b802b
+
+## [1.4.0~1](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.0~1)
+
+#### Bug Fixes
+
+- fix compiling error for `to_underlying` when using c++23
+- `NDEBUG` flag will be added if `CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE` is set.
+
+#### Features
+
+- Use v1.4.0~N based on Matter v1.4.0, remove component v1.4.1
+- esp-matter commit: bea837ee556c82571537791c774d2e2aa219fa33
+- connectedhomeip commit: 87cf8e5030284e3357cfdff5e0b83eb9d5ff73c9
+
+## [1.4.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.4.0)
+
+#### Features
+
+- Component based on Matter 1.4
+- esp-matter commit: 30af618a6e962623a0098ad6a33b468f33dc49c7
+- connectedhomeip commit: cd07c4f5c3988258e6eba9d34d3dc0767d95e5a3
+
+## [1.3.1](https://components.espressif.com/components/espressif/esp_matter/versions/1.3.1)
+
+#### Features
+
+- Work with IDF component management (version >= 2.0) without hash problem
+- External platform path setting: support both absolute path or relative path to top-level CMakeLists
+- More default compile options for the source files
+- Could enable CONFIG_CHIP_OTA_IMAGE_BUILD to generate ota.bin file with IDF component management (version >= 2.0)
+- esp-matter commit: 5a9bc09a640d5cfd4c6b137f7e3b13ce5fa9cca4
+- connectedhomeip commit: 735b69f73e386cb675242371afd0b237a8a78982
+
+## [1.3.0](https://components.espressif.com/components/espressif/esp_matter/versions/1.3.0)
+
+#### Features
+
+- Component `esp_matter` based on branch release/v1.3 [commit](https://github.com/espressif/esp-matter/commit/d76d4857d768b32eb215e825448d938018e5691a), commit date Jun 11, 2024.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37e48af0f..a3afc40dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,12 @@
 get_filename_component(MATTER_SDK_PATH ${CMAKE_CURRENT_SOURCE_DIR}/connectedhomeip/connectedhomeip/ REALPATH)
 
 get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_LIST_DIR}/connectedhomeip/connectedhomeip/ REALPATH)
-include(${CMAKE_CURRENT_LIST_DIR}/connectedhomeip/connectedhomeip/config/esp32/components/chip/ota-image.cmake)
 
 set(ESP_COMPONENTS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/components)
 
-set(REQUIRE_COMPONENTS esp_eth freertos lwip bt mbedtls fatfs app_update console openthread nvs_flash spi_flash
+set(REQUIRE_COMPONENTS esp_eth freertos lwip bt mbedtls fatfs app_update console openthread nvs_flash spi_flash mdns
     esp_secure_cert_mgr esp_system esp_timer json_parser spiffs esp_http_client json_generator esp_netif vfs json)
 
-if(NOT "${IDF_TARGET}" STREQUAL "esp32h2")
-    list(APPEND REQUIRE_COMPONENTS mdns)
-endif()
-
 function(collect_exclude_files PATH INCLUDE_FILES EXCLUDE_LIST)
     file(GLOB ALL_FILES ${PATH}/*.cpp ${PATH}/*.c)
     set(EXCLUDE_FILES "")
@@ -27,14 +22,19 @@ endfunction()
 set(SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/access"
                   "${MATTER_SDK_PATH}/src/access/examples"
                   "${MATTER_SDK_PATH}/src/app"
+                  "${MATTER_SDK_PATH}/src/app/data-model"
+                  "${MATTER_SDK_PATH}/src/app/data-model-provider"
                   "${MATTER_SDK_PATH}/src/app/MessageDef"
                   "${MATTER_SDK_PATH}/src/app/reporting"
                   "${MATTER_SDK_PATH}/src/app/server"
+                  "${MATTER_SDK_PATH}/src/app/server-cluster"
+                  "${MATTER_SDK_PATH}/src/app/util"
+                  "${MATTER_SDK_PATH}/src/app/util/persistence"
+                #   "${MATTER_SDK_PATH}/src/app/storage"
                   "${MATTER_SDK_PATH}/src/ble"
                   "${MATTER_SDK_PATH}/src/credentials"
                   "${MATTER_SDK_PATH}/src/credentials/attestation_verifier"
                   "${MATTER_SDK_PATH}/src/credentials/examples"
-                  "${MATTER_SDK_PATH}/src/credentials/tests"
                   "${MATTER_SDK_PATH}/src/crypto"
                   "${MATTER_SDK_PATH}/src/inet"
                   "${MATTER_SDK_PATH}/src/lib/address_resolve"
@@ -54,6 +54,7 @@ set(SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/access"
                   "${MATTER_SDK_PATH}/src/protocols"
                   "${MATTER_SDK_PATH}/src/protocols/bdx"
                   "${MATTER_SDK_PATH}/src/protocols/echo"
+                  "${MATTER_SDK_PATH}/src/protocols/interaction_model"
                   "${MATTER_SDK_PATH}/src/protocols/secure_channel"
                   "${MATTER_SDK_PATH}/src/protocols/user_directed_commissioning"
                   "${MATTER_SDK_PATH}/src/setup_payload"
@@ -67,36 +68,35 @@ set(SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/access"
 set(INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src"
                       "${MATTER_SDK_PATH}/src/include"
                       "${MATTER_SDK_PATH}/src/lib"
+                      "${MATTER_SDK_PATH}/src/lib/dnssd"
                       "${MATTER_SDK_PATH}/src/platform/OpenThread"
+                      "${MATTER_SDK_PATH}/third_party/jsoncpp/repo/include"
                       "${MATTER_SDK_PATH}/third_party/nlfaultinjection/include"
                       "${MATTER_SDK_PATH}/third_party/nlassert/repo/include"
                       "${MATTER_SDK_PATH}/third_party/nlio/repo/include"
                       "${MATTER_SDK_PATH}/zzz_generated/app-common")
 
-set(EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/controller/ExamplePersistentStorage.cpp"
+set(EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/AttributePathExpandIterator-Checked.cpp"
+                      "${MATTER_SDK_PATH}/src/app/AttributePathExpandIterator-DataModel.cpp"
+                      "${MATTER_SDK_PATH}/src/app/data-model-provider/StringBuilderAdapters.cpp"
+                      "${MATTER_SDK_PATH}/src/controller/ExamplePersistentStorage.cpp"
                       "${MATTER_SDK_PATH}/src/credentials/attestation_verifier/FileAttestationTrustStore.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/CHIPCert_error_test_vectors.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/CHIPCert_test_vectors.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/CHIPCert_unit_test_vectors.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/FuzzChipCert.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestCertificationDeclaration.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestChipCert.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestCommissionerDUTVectors.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestDeviceAttestationConstruction.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestDeviceAttestationCredentials.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestFabricTable.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestGroupDataProvider.cpp"
-                      "${MATTER_SDK_PATH}/src/credentials/tests/TestPersistentStorageOpCertStore.cpp"
+                      "${MATTER_SDK_PATH}/src/credentials/attestation_verifier/TestDACRevocationDelegateImpl.cpp"
                       "${MATTER_SDK_PATH}/src/crypto/CHIPCryptoPALOpenSSL.cpp"
                       "${MATTER_SDK_PATH}/src/crypto/CHIPCryptoPALPSA.cpp"
                       "${MATTER_SDK_PATH}/src/crypto/PSAOperationalKeystore.cpp"
+                      "${MATTER_SDK_PATH}/src/crypto/PSASpake2p.cpp"
                       "${MATTER_SDK_PATH}/src/crypto/PSASessionKeystore.cpp"
+                      "${MATTER_SDK_PATH}/src/inet/TCPEndPoint.cpp"
+                      "${MATTER_SDK_PATH}/src/inet/TCPEndPointImplLwIP.cpp"
                       "${MATTER_SDK_PATH}/src/inet/TCPEndPointImplOpenThread.cpp"
                       "${MATTER_SDK_PATH}/src/inet/TCPEndPointImplSockets.cpp"
                       "${MATTER_SDK_PATH}/src/inet/UDPEndPointImplNetworkFramework.cpp"
                       "${MATTER_SDK_PATH}/src/inet/UDPEndPointImplOpenThread.cpp"
                       "${MATTER_SDK_PATH}/src/inet/UDPEndPointImplSockets.cpp"
                       "${MATTER_SDK_PATH}/src/lib/address_resolve/tool.cpp"
+                      "${MATTER_SDK_PATH}/src/lib/core/StringBuilderAdapters.cpp"
+                      "${MATTER_SDK_PATH}/src/lib/core/TLVVectorWriter.cpp"
                       "${MATTER_SDK_PATH}/src/lib/dnssd/Advertiser_ImplNone.cpp"
                       "${MATTER_SDK_PATH}/src/lib/dnssd/Resolver_ImplNone.cpp"
                       "${MATTER_SDK_PATH}/src/lib/dnssd/minimal_mdns/AddressPolicy_LibNlImpl.cpp"
@@ -105,62 +105,111 @@ set(EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/controller/ExamplePersistentStorag
                       "${MATTER_SDK_PATH}/src/lib/support/UnitTest.cpp"
                       "${MATTER_SDK_PATH}/src/lib/support/UnitTestUtils.cpp"
                       "${MATTER_SDK_PATH}/src/lib/support/JniReferences.cpp"
+                      "${MATTER_SDK_PATH}/src/lib/support/CHIPMem-Malloc.cpp"
                       "${MATTER_SDK_PATH}/src/lib/support/CHIPMem-Simple.cpp"
                       "${MATTER_SDK_PATH}/src/lib/shell/commands/NFC.cpp"
                       "${MATTER_SDK_PATH}/src/platform/DeviceSafeQueue.cpp"
                       "${MATTER_SDK_PATH}/src/platform/SyscallStubs.cpp"
+                      "${MATTER_SDK_PATH}/src/platform/OpenThread/DnssdImpl.cpp"
                       "${MATTER_SDK_PATH}/src/platform/OpenThread/GenericThreadStackManagerImpl_OpenThread_LwIP.cpp"
                       "${MATTER_SDK_PATH}/src/system/SystemLayerImplSelect.cpp"
+                      "${MATTER_SDK_PATH}/src/system/SystemLayerImplZephyr.cpp"
+                      "${MATTER_SDK_PATH}/src/transport/raw/TCP.cpp"
+                      "${MATTER_SDK_PATH}/src/transport/raw/WiFiPAF.cpp"
+                      "${MATTER_SDK_PATH}/src/transport/raw/NFC.cpp"
                       "${MATTER_SDK_PATH}/src/transport/TraceMessage.cpp")
 
 list(APPEND INCLUDE_DIRS_LIST "${CMAKE_CURRENT_BINARY_DIR}")
 
-file(GLOB CLUSTER_DIR_LIST true ${MATTER_SDK_PATH}/src/app/clusters/*)
-foreach(CLUSTER_DIR ${CLUSTER_DIR_LIST})
-    file(GLOB_RECURSE C_CPP_FILES "${CLUSTER_DIR}/*.c" "${CLUSTER_DIR}/*.cpp")
-    if (C_CPP_FILES)
-        list(APPEND SRC_DIRS_LIST "${CLUSTER_DIR}")
-    endif()
-endforeach()
+if (CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER)
+    list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/data-model-providers/codegen")
+    if (CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
+        include("${ESP_COMPONENTS_PATH}/esp_matter/utils/cluster_select/cluster_dir.cmake")
+        get_supported_cluster_dirs(SUPPORTED_CLUSTER_DIRS)
+        foreach(CLUSTER_DIR ${SUPPORTED_CLUSTER_DIRS})
+            # If the cluster directory has .c/.cpp file, add it to SRC_DIRS_LIST
+            file(GLOB_RECURSE C_CPP_FILES "${CLUSTER_DIR}/*.c" "${CLUSTER_DIR}/*.cpp")
+            if (C_CPP_FILES)
+                list(APPEND SRC_DIRS_LIST "${CLUSTER_DIR}")
+            endif()
+        endforeach()
+
+        list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/zap_common/app"
+                                  "${ESP_COMPONENTS_PATH}/esp_matter/data_model"
+                                  "${ESP_COMPONENTS_PATH}/esp_matter/private")
+        list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/zap_common"
+                                      "${ESP_COMPONENTS_PATH}/esp_matter/data_model")
+
+        if(NOT CONFIG_SUPPORT_SOFTWARE_DIAGNOSTICS_CLUSTER)
+              list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/data_model/software_diagnostics_codegen_integration.cpp")
+        endif()
+
+    endif(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
+else()
+    list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/esp_matter_identify.cpp"
+                                  "${ESP_COMPONENTS_PATH}/esp_matter/esp_matter_ota.cpp"
+                                  "${ESP_COMPONENTS_PATH}/esp_matter/esp_matter_attribute_utils.cpp")
+    set(UTIL_FILES "${MATTER_SDK_PATH}/src/app/util/MatterCallbacks.cpp")
+    collect_exclude_files("${MATTER_SDK_PATH}/src/app/util" "${UTIL_FILES}" ESP_MATTER_EXCLUDE_FILES)
+    list(APPEND EXCLUDE_SRCS_LIST "${ESP_MATTER_EXCLUDE_FILES}")
+endif()
+
+list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/clusters/software-diagnostics-server/CodegenIntegration.cpp"
+                              "${MATTER_SDK_PATH}/src/app/clusters/administrator-commissioning-server/CodegenIntegration.cpp"
+                              "${MATTER_SDK_PATH}/src/app/clusters/ota-provider/CodegenIntegration.cpp")
 
 list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter"
-                          "${ESP_COMPONENTS_PATH}/esp_matter/private"
                           "${ESP_COMPONENTS_PATH}/esp_matter/utils"
                           "${MATTER_SDK_PATH}/zzz_generated/app-common/app-common/zap-generated/attributes"
-                          "${MATTER_SDK_PATH}/src/app/util"
-                          "${ESP_COMPONENTS_PATH}/esp_matter_bridge"
                           "${ESP_COMPONENTS_PATH}/esp_matter_console")
 
 list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter"
                               "${ESP_COMPONENTS_PATH}/esp_matter/utils"
-                              "${ESP_COMPONENTS_PATH}/esp_matter_bridge"
                               "${ESP_COMPONENTS_PATH}/esp_matter_console")
 
 if (CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
-    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/zap_common/app")
-    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/zap_common")
+    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_bridge")
+    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_bridge")
 endif()
 
-set(PRIV_INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/private")
+set(PRIV_INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter/private"
+                           "${ESP_COMPONENTS_PATH}/esp_matter/data_model/private")
+
+# TODO: This file has compilation errors
+list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/clusters/closure-control-server/closure-control-server.cpp")
+list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/clusters/general-commissioning-server/TemporaryTestCoupling.cpp")
 
 if (CONFIG_ESP_MATTER_CONTROLLER_ENABLE)
-    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller"
-                              "${ESP_COMPONENTS_PATH}/esp_matter_controller/logger/zap-generated")
-    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller"
-                                  "${ESP_COMPONENTS_PATH}/esp_matter_controller/logger")
+    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/core"
+                              "${ESP_COMPONENTS_PATH}/esp_matter_controller/commands"
+                              "${MATTER_SDK_PATH}/src/app/icd/client"
+                              "${MATTER_SDK_PATH}/zzz_generated/chip-tool/zap-generated/cluster/logging")
+    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/core"
+                                  "${ESP_COMPONENTS_PATH}/esp_matter_controller/commands"
+                                  "${MATTER_SDK_PATH}/zzz_generated/chip-tool"
+                                  "${MATTER_SDK_PATH}/examples/chip-tool/"
+                                  "${ESP_COMPONENTS_PATH}/esp_matter_controller/data_model_provider")
 
-    if (CONFIG_ESP_MATTER_CONTROLLER_CUSTOM_CLUSTER_ENABLE)
-        list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/controller_custom_cluster")
-        list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/controller_custom_cluster")
+    if (CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER)
+         list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/core/esp_matter_controller_client.cpp"
+                                       "${ESP_COMPONENTS_PATH}/esp_matter_controller/core/esp_matter_controller_credentials_issuer.cpp"
+                                       "${ESP_COMPONENTS_PATH}/esp_matter_controller/core/esp_matter_controller_group_settings.cpp"
+                                       "${ESP_COMPONENTS_PATH}/esp_matter_controller/core/esp_matter_controller_icd_client.cpp")
     endif()
-    if (NOT CONFIG_ESP_MATTER_COMMISSIONER_ENABLE)
-        list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_commissioner.cpp"
-                                      "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_controller_pairing_command.cpp"
-                                      "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_attestation_trust_store.cpp"
-                                      "${ESP_COMPONENTS_PATH}/esp_matter_controller/esp_matter_controller_group_settings.cpp")
+    if (CONFIG_ESP_MATTER_COMMISSIONER_ENABLE)
+        list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/attestation_store")
+        list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/attestation_store")
+    else()
+        list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_controller/commands/esp_matter_controller_pairing_command.cpp")
     endif()
 endif()
 
+if (CONFIG_ESP_MATTER_OTA_PROVIDER_ENABLED)
+    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_ota_provider/src")
+    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_ota_provider/include")
+    list(APPEND PRIV_INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_ota_provider/private_include")
+endif()
+
 idf_build_get_property(rainmaker_enabled RAINMAKER_ENABLED)
 if (${rainmaker_enabled})
     list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_rainmaker")
@@ -168,14 +217,6 @@ if (${rainmaker_enabled})
     list(APPEND REQUIRE_COMPONENTS esp_rainmaker)
 endif()
 
-if (CONFIG_OPENTHREAD_BORDER_ROUTER)
-    list(APPEND INCLUDE_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_thread_br")
-    list(APPEND SRC_DIRS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_thread_br")
-    if ((NOT CONFIG_ENABLE_CHIP_SHELL) OR (NOT CONFIG_OPENTHREAD_CLI))
-        list(APPEND EXCLUDE_SRCS_LIST "${ESP_COMPONENTS_PATH}/esp_matter_thread_br/esp_matter_thread_br_console.cpp")
-    endif()
-endif()
-
 # ESP-IDF lets user set software version string by two ways:
 # 1. Project's CMakeLists.txt file and 2. Config option
 # It depends on CONFIG_APP_PROJECT_VER_FROM_CONFIG option
@@ -226,10 +267,11 @@ endif()
 
 if (CONFIG_ENABLE_CHIP_SHELL)
     list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/lib/shell")
-    list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/lib/shell/commands")    
+    list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/lib/shell/commands")
     set(ESP_SHELL_FILES "${MATTER_SDK_PATH}/src/lib/shell/MainLoopESP32.cpp"
                         "${MATTER_SDK_PATH}/src/lib/shell/streamer_esp32.cpp"
                         "${MATTER_SDK_PATH}/src/lib/shell/Engine.cpp"
+                        "${MATTER_SDK_PATH}/src/lib/shell/CommandSet.cpp"
                         "${MATTER_SDK_PATH}/src/lib/shell/streamer.cpp")
     collect_exclude_files("${MATTER_SDK_PATH}/src/lib/shell" "${ESP_SHELL_FILES}" SHELL_EXCLUDE_FILES)
     list(APPEND EXCLUDE_SRCS_LIST "${SHELL_EXCLUDE_FILES}")
@@ -249,8 +291,7 @@ if((NOT CONFIG_ENABLE_WIFI_STATION) AND (NOT CONFIG_ENABLE_WIFI_AP))
 endif()
 
 if (NOT CONFIG_ENABLE_MATTER_OVER_THREAD)
-    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/OpenThread/DnssdImpl.cpp"
-                                  "${MATTER_SDK_PATH}/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp"
+    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/OpenThread/GenericNetworkCommissioningThreadDriver.cpp"
                                   "${MATTER_SDK_PATH}/src/platform/OpenThread/OpenThreadUtils.cpp"
                                   "${MATTER_SDK_PATH}/src/platform/OpenThread/OpenThreadDnssdImpl.cpp")
 endif()
@@ -267,15 +308,55 @@ else()
     set(CHIP_PROJECT_CONFIG "")
 endif()
 
-if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE)
+if (CONFIG_ENABLE_ESP_INSIGHTS_TRACE AND (NOT "${IDF_TARGET}" STREQUAL "esp32h2"))
     list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace")
-    list(APPEND INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace/include")
+    list(APPEND INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace/include"
+                                  "${MATTER_SDK_PATH}/src/tracing/esp32_trace")
+    if (NOT CONFIG_ENABLE_ESP_INSIGHTS_SYSTEM_STATS)
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_trace/insights_sys_stats.cpp")
+    endif()
+endif()
+
+if (CONFIG_ENABLE_ESP_DIAGNOSTICS_TRACE)
+    list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_diagnostic_trace")
+    list(APPEND INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src/tracing/esp32_diagnostic_trace/include"
+                                  "${MATTER_SDK_PATH}/src/tracing/esp32_diagnostic_trace")
+endif()
+
+if (CONFIG_CHIP_DEVICE_ENABLE_DYNAMIC_SERVER)
+    list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/app/dynamic_server")
+    list(APPEND INCLUDE_DIRS_LIST "${MATTER_SDK_PATH}/src/app/dynamic_server")
+else()
+    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/controller/EmptyDataModelHandler.cpp")
+endif()
+
+if (NOT CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS)
+    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/SimpleSubscriptionResumptionStorage.cpp"
+                                  "${MATTER_SDK_PATH}/src/app/SubscriptionResumptionSessionEstablisher.cpp")
+endif()
+
+if (NOT CONFIG_OPENTHREAD_BORDER_ROUTER)
+    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/OpenThread/GenericThreadBorderRouterDelegate.cpp")
+endif()
+
+if (NOT CONFIG_ENABLE_OTA_REQUESTOR)
+    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/lib/shell/commands/Ota.cpp")
+endif()
+
+if (NOT CONFIG_ENABLE_ACCESS_RESTRICTIONS)
+    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/access/AccessRestrictionProvider.cpp")
 endif()
 
 if (CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM)
     # check the source file dir if external platform is enable
-    if ((EXISTS ${CONFIG_CHIP_EXTERNAL_PLATFORM_DIR}/external_platform.cmake))
-        include(${CONFIG_CHIP_EXTERNAL_PLATFORM_DIR}/external_platform.cmake)
+    if (IS_ABSOLUTE ${CONFIG_CHIP_EXTERNAL_PLATFORM_DIR})
+        get_filename_component(EXTERNAL_PLATFORM_DIR ${CONFIG_CHIP_EXTERNAL_PLATFORM_DIR} REALPATH)
+    else()
+        get_filename_component(EXTERNAL_PLATFORM_DIR ${CMAKE_SOURCE_DIR}/${CONFIG_CHIP_EXTERNAL_PLATFORM_DIR} REALPATH)
+    endif()
+    message("EXTERNAL_PLATFORM_DIR: ${EXTERNAL_PLATFORM_DIR}")
+    if ((EXISTS ${EXTERNAL_PLATFORM_DIR}/external_platform.cmake))
+        include(${EXTERNAL_PLATFORM_DIR}/external_platform.cmake)
         list(APPEND SRC_DIRS_LIST ${EXPLANT_SRC_DIRS_LIST})
         list(APPEND INCLUDE_DIRS_LIST ${EXPLANT_INCLUDE_DIRS_LIST})
         list(APPEND EXCLUDE_SRCS_LIST ${EXPLANT_EXCLUDE_SRCS_LIST})
@@ -296,7 +377,7 @@ else()
     endif()
 
     if ((CONFIG_USE_MINIMAL_MDNS) OR ((NOT CONFIG_ENABLE_WIFI_STATION) AND (NOT CONFIG_ENABLE_WIFI_AP)))
-        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/WiFiDnssdImpl.cpp")
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32DnssdImpl.cpp")
     endif()
 
     if((NOT CONFIG_ENABLE_WIFI_STATION) AND (NOT CONFIG_ENABLE_WIFI_AP))
@@ -314,17 +395,15 @@ else()
     if ((CONFIG_BT_ENABLED) AND (CONFIG_ENABLE_CHIPOBLE))
         if (CONFIG_BT_NIMBLE_ENABLED)
             list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/nimble")
-            list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp")
-            if(NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
-                list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/bluedroid/ChipDeviceScanner.cpp")
+            if (NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
+                list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/nimble/ChipDeviceScanner.cpp"
+                                                  "${MATTER_SDK_PATH}/src/platform/ESP32/nimble/misc.c"
+                                                  "${MATTER_SDK_PATH}/src/platform/ESP32/nimble/peer.c")
             endif()
         else()
             list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/bluedroid")
-            list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/nimble/BLEManagerImpl.cpp")
-            if(NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
-                list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/nimble/ChipDeviceScanner.cpp"
-                                              "${MATTER_SDK_PATH}/src/platform/ESP32/nimble/misc.c"
-                                              "${MATTER_SDK_PATH}/src/platform/ESP32/nimble/peer.c")
+            if (NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
+                list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/bluedroid/ChipDeviceScanner.cpp")
             endif()
         endif()
     endif()
@@ -348,16 +427,29 @@ else()
     endif()
 
     if (NOT CONFIG_ENABLE_ESP32_DEVICE_INFO_PROVIDER)
-        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32DeviceInfoProvider.cpp")
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32DeviceInfoProvider.cpp"
+                                      "${MATTER_SDK_PATH}/src/platform/ESP32/StaticESP32DeviceInfoProvider.cpp")
     endif()
 
     if (NOT CONFIG_SEC_CERT_DAC_PROVIDER)
-        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32SecureCertDACProvider.cpp")
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32SecureCertDataProvider.cpp"
+                                      "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32SecureCertDACProvider.cpp")
     endif()
 
     if (NOT CONFIG_USE_ESP32_ECDSA_PERIPHERAL)
         list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/ESP32CHIPCryptoPAL.cpp")
     endif()
+
+    if(CONFIG_CHIP_MEM_ALLOC_MODE_INTERNAL)
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/CHIPMem-PlatformExternal.cpp"
+                                      "${MATTER_SDK_PATH}/src/platform/ESP32/CHIPMem-PlatformDefault.cpp")
+    elseif(CONFIG_CHIP_MEM_ALLOC_MODE_EXTERNAL)
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/CHIPMem-PlatformInternal.cpp"
+                                      "${MATTER_SDK_PATH}/src/platform/ESP32/CHIPMem-PlatformDefault.cpp")
+    elseif(CONFIG_CHIP_MEM_ALLOC_MODE_DEFAULT)
+        list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/platform/ESP32/CHIPMem-PlatformInternal.cpp"
+                                      "${MATTER_SDK_PATH}/src/platform/ESP32/CHIPMem-PlatformExternal.cpp")
+    endif()
 endif()
 
 if (NOT CONFIG_ENABLE_CHIPOBLE)
@@ -388,9 +480,31 @@ if (CHIP_PROJECT_CONFIG)
                            "-DSYSTEM_PROJECT_CONFIG_INCLUDE=${CHIP_PROJECT_CONFIG}")
 endif()
 
-idf_build_set_property(COMPILE_OPTIONS "-Wno-error=uninitialized;-Wno-error=maybe-uninitialized;-Wno-format-nonliteral;-Wno-missing-field-initializers;" APPEND)
-idf_build_set_property(COMPILE_OPTIONS "-Wno-error=array-bounds" APPEND)
-idf_build_set_property(COMPILE_OPTIONS "-Wno-write-strings" APPEND)
+if (CONFIG_ESP_MATTER_CONTROLLER_ENABLE)
+    target_compile_options(${COMPONENT_LIB} PRIVATE "-DCURRENT_TIME_NOT_IMPLEMENTED=1")
+endif()
+
+#TODO: optimize the flash usage
+# compile options from connectedhomeip/build/config/compiler except -Wconversion, -Wshadow, and -Wno-unknown-warning-option
+target_compile_options(${COMPONENT_LIB} PRIVATE "-g2;-fno-common;-fno-unwind-tables;-fno-asynchronous-unwind-tables")
+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wstack-usage=8192;-Wunreachable-code;-Wvla")
+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wformat;-Wformat-nonliteral;-Wformat-security")
+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-deprecated-declarations;-Wno-unused")
+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-cast-function-type;-Wno-psabi;-Wno-maybe-uninitialized")
+target_compile_options(${COMPONENT_LIB} PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wnon-virtual-dtor>)
+
+# link options from connectedhomeip/build/config/compiler
+target_link_options(${COMPONENT_LIB} PRIVATE -Wl,-O2 -Wl,--gc-sections -Os -Werror -Wl,--fatal-warnings -fdiagnostics-color)
+
+# compile options from esp-matter/components/
+target_compile_options(${COMPONENT_LIB} PUBLIC "-Wno-error=uninitialized;-Wno-error=maybe-uninitialized;-Wno-missing-field-initializers")
+target_compile_options(${COMPONENT_LIB} PUBLIC "-Wno-error=array-bounds;-Wno-write-strings")
+target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_HAVE_CONFIG_H")
+
+# TODO: remove this when building connectedhomeip/src/controller/CHIPDeviceController.cpp with no format error
+if (CONFIG_ENABLE_CHIP_CONTROLLER_BUILD)
+    target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-error=format")
+endif()
 
 # For Xtensa chips, uint32_t was defined as 'unsigned' before v5.0, and after IDF v5.0 it is defined
 # as 'unsigned long', same as RISC-V. add this compile option to avoid format errors.
@@ -404,23 +518,49 @@ if (CONFIG_DISABLE_READ_CLIENT)
     target_compile_options(${COMPONENT_LIB} PUBLIC "-DTIME_SYNC_ENABLE_TSC_FEATURE=0")
 endif()
 
+if(CONFIG_DISABLE_IPV4)
+    if(CONFIG_LWIP_IPV4)
+        message(FATAL_ERROR "Please also disable config option CONFIG_LWIP_IPV4")
+    else()
+        target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_DEVICE_CONFIG_ENABLE_IPV4=false")
+    endif()
+else()
+    target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_DEVICE_CONFIG_ENABLE_IPV4=true")
+endif()
+
 if (CONFIG_USE_MINIMAL_MDNS)
     target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_MINMDNS_DEFAULT_POLICY=1"
                                                    "-DCHIP_MINMDNS_USE_EPHEMERAL_UNICAST_PORT=0"
-                                                   "-DCHIP_MINMDNS_HIGH_VERBOSITY=0")
+                                                   "-DCHIP_MINMDNS_HIGH_VERBOSITY=0"
+                                                   "-DCHIP_DNSSD_DEFAULT_MINIMAL=true"
+                                                   "-DCHIP_DNSSD_DEFAULT_NONE=false"
+                                                   "-DCHIP_DNSSD_DEFAULT_PLATFORM=false")
+else()
+    target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_DNSSD_DEFAULT_PLATFORM=true"
+                                                   "-DCHIP_DNSSD_DEFAULT_NONE=false"
+                                                   "-DCHIP_DNSSD_DEFAULT_MINIMAL=false")
 endif()
 
 if (NOT CMAKE_BUILD_EARLY_EXPANSION)
     if (CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
-        target_compile_options(${COMPONENT_LIB} PUBLIC "-DLWIP_DEBUG=1")
+        target_compile_options(${COMPONENT_LIB} PRIVATE "-DNDEBUG")
     endif()
 endif()
 
-if (NOT CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
-    target_include_directories(${COMPONENT_LIB} PUBLIC "${CMAKE_BINARY_DIR}/gen/app-codegen/cpp-app"
-                                                       "${CMAKE_BINARY_DIR}/gen/app-zapgen/zapgen/app-templates")
+if (CONFIG_CHIP_DEVICE_ENABLE_DYNAMIC_SERVER)
+    target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES=1"
+                                                    "-DCHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT=1")
 endif()
 
+if (CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER)
+    if (CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
+        target_link_libraries(${COMPONENT_LIB} INTERFACE "-u data_model_utils_impl")
+    else()
+        target_include_directories(${COMPONENT_LIB} PUBLIC "${CMAKE_BINARY_DIR}/gen/__idf_main-codegen/cpp-app"
+                                                           "${CMAKE_BINARY_DIR}/gen/__idf_main-zapgen/zapgen/app-templates")
+    endif(CONFIG_ESP_MATTER_ENABLE_DATA_MODEL)
+endif(CONFIG_ESP_MATTER_ENABLE_MATTER_SERVER)
+
 idf_component_get_property(freertos_dir freertos COMPONENT_DIR)
 target_include_directories(${COMPONENT_LIB} PRIVATE
     "${freertos_dir}/include/freertos"
@@ -430,21 +570,38 @@ target_include_directories(${COMPONENT_LIB} INTERFACE
     "${MATTER_SDK_PATH}/examples/platform/esp32")
 
 #Generate some include files
-include(${CMAKE_CURRENT_LIST_DIR}/generate-include-files.cmake)
+file(GLOB cmake_generate_include_files "${CMAKE_CURRENT_LIST_DIR}/managed_component_include/*.cmake")
+foreach(cmake_file ${cmake_generate_include_files})
+    include(${cmake_file})
+endforeach()
 
-idf_component_get_property(main_lib main COMPONENT_LIB)
+if (NOT EXECUTABLE_COMPONENT_NAME)
+    set(EXECUTABLE_COMPONENT_NAME "main")
+endif()
+idf_component_get_property(main_lib ${EXECUTABLE_COMPONENT_NAME} COMPONENT_LIB)
 set(chip_libraries $<TARGET_FILE:${main_lib}>)
 target_link_libraries(${COMPONENT_LIB} INTERFACE -Wl,--start-group
                                                 ${chip_libraries}
                                                 -Wl,--end-group)
 
-# TODO: Build OTA image need a python package, leading a file change and distorying the hash of managed_components.
+cmake_policy(GET CMP0007 policy_status)
+# Set new CMP0007 policy to prevent cmake warning
+cmake_policy(SET CMP0007 NEW)
+include(${CMAKE_CURRENT_LIST_DIR}/connectedhomeip/connectedhomeip/config/esp32/components/chip/ota-image.cmake)
 # Build Matter OTA image
-if (false AND CONFIG_CHIP_OTA_IMAGE_BUILD)
-    chip_ota_image(chip-ota-image
-        INPUT_FILES ${BUILD_DIR}/${CMAKE_PROJECT_NAME}.bin
-        OUTPUT_FILE ${BUILD_DIR}/${CMAKE_PROJECT_NAME}-ota.bin
-    )
-    # Adding dependecy as app target so that this runs after images are ready
-    add_dependencies(chip-ota-image app)
+if (CONFIG_CHIP_OTA_IMAGE_BUILD)
+    if (CONFIG_OPENTHREAD_BORDER_ROUTER AND CONFIG_AUTO_UPDATE_RCP)
+        chip_ota_image(chip-ota-image
+            INPUT_FILES ${BUILD_DIR}/ota_with_rcp_image
+            OUTPUT_FILE ${BUILD_DIR}/ota_with_rcp_image-ota.bin
+        )
+        add_dependencies(chip-ota-image gen_ota_image)
+    else()
+        chip_ota_image(chip-ota-image
+            INPUT_FILES ${BUILD_DIR}/${CMAKE_PROJECT_NAME}.bin
+            OUTPUT_FILE ${BUILD_DIR}/${CMAKE_PROJECT_NAME}-ota.bin
+        )
+        add_dependencies(chip-ota-image app)
+    endif()
 endif()
+cmake_policy(SET CMP0007 ${policy_status})
diff --git a/Kconfig b/Kconfig
index ff5947028..ca489232d 100644
--- a/Kconfig
+++ b/Kconfig
@@ -2,4 +2,5 @@ rsource "connectedhomeip/connectedhomeip/config/esp32/components/chip/Kconfig"
 rsource "components/esp_matter/Kconfig"
 rsource "components/esp_matter_bridge/Kconfig"
 rsource "components/esp_matter_console/Kconfig"
-rsource "components/esp_matter_controller/Kconfig"
\ No newline at end of file
+rsource "components/esp_matter_controller/Kconfig"
+rsource "components/esp_matter_ota_provider/Kconfig"
\ No newline at end of file
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/external_platform.cmake b/examples/common/blemesh_platform/platform/ESP32_custom/external_platform.cmake
index 65300d13a..c8544e64d 100644
--- a/examples/common/blemesh_platform/platform/ESP32_custom/external_platform.cmake
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/external_platform.cmake
@@ -33,18 +33,16 @@ endif()
 if ((CONFIG_BT_ENABLED) AND (CONFIG_ENABLE_CHIPOBLE))
     if (CONFIG_BT_NIMBLE_ENABLED)
         list(APPEND EXPLANT_SRC_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}/nimble")
-        list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid/BLEManagerImpl.cpp")
-        if(NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
-            list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid/ChipDeviceScanner.cpp")
-        endif()
-    else()
-        list(APPEND EXPLANT_SRC_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid")
-        list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/nimble/BLEManagerImpl.cpp")
         if(NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
             list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/nimble/ChipDeviceScanner.cpp"
                                                   "${CMAKE_CURRENT_LIST_DIR}/nimble/misc.c"
                                                   "${CMAKE_CURRENT_LIST_DIR}/nimble/peer.c")
         endif()
+    else()
+        list(APPEND EXPLANT_SRC_DIRS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid")
+        if(NOT CONFIG_ENABLE_ESP32_BLE_CONTROLLER)
+            list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/bluedroid/ChipDeviceScanner.cpp")
+        endif()
     endif()
 endif()
 
@@ -53,8 +51,8 @@ if (NOT CONFIG_ENABLE_ETHERNET_TELEMETRY)
                                           "${CMAKE_CURRENT_LIST_DIR}/NetworkCommissioningDriver_Ethernet.cpp")
 endif()
 
-if (NOT CONFIG_ENABLE_MATTER_OVER_THREAD)
-    list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/OpenthreadLauncher.c"
+if ((NOT CONFIG_OPENTHREAD_ENABLED) OR (NOT CONFIG_ENABLE_MATTER_OVER_THREAD))
+    list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/OpenthreadLauncher.cpp"
                                           "${CMAKE_CURRENT_LIST_DIR}/ThreadStackManagerImpl.cpp")
 endif()
 
@@ -78,3 +76,20 @@ endif()
 if (NOT CONFIG_USE_ESP32_ECDSA_PERIPHERAL)
     list(APPEND EXPLANT_EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/ESP32CHIPCryptoPAL.cpp")
 endif()
+
+if(CONFIG_CHIP_MEM_ALLOC_MODE_INTERNAL)
+    list(APPEND EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/src/platform/ESP32/CHIPMem-PlatformExternal.cpp"
+                                  "${CMAKE_CURRENT_LIST_DIR}/src/platform/ESP32/CHIPMem-PlatformDefault.cpp")
+elseif(CONFIG_CHIP_MEM_ALLOC_MODE_EXTERNAL)
+    list(APPEND EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/src/platform/ESP32/CHIPMem-PlatformInternal.cpp"
+                                  "${CMAKE_CURRENT_LIST_DIR}/src/platform/ESP32/CHIPMem-PlatformDefault.cpp")
+elseif(CONFIG_CHIP_MEM_ALLOC_MODE_DEFAULT)
+    list(APPEND EXCLUDE_SRCS_LIST "${CMAKE_CURRENT_LIST_DIR}/src/platform/ESP32/CHIPMem-PlatformInternal.cpp"
+                                  "${CMAKE_CURRENT_LIST_DIR}/src/platform/ESP32/CHIPMem-PlatformExternal.cpp")
+endif()
+
+if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/generate-include-files.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/generate-include-files.cmake)
+else()
+    message(FATAL_ERROR "There should be a generate-include-files.cmake file in CONFIG_CHIP_EXTERNAL_PLATFORM_DIR!")
+endif()
diff --git a/examples/common/blemesh_platform/platform/ESP32_custom/generate-include-files.cmake b/examples/common/blemesh_platform/platform/ESP32_custom/generate-include-files.cmake
new file mode 100644
index 000000000..611ecee69
--- /dev/null
+++ b/examples/common/blemesh_platform/platform/ESP32_custom/generate-include-files.cmake
@@ -0,0 +1,92 @@
+if (CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM)
+# Generating platform/CHIPDeviceBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/platform/CHIPDeviceBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+
+#if defined(CONFIG_ENABLE_WIFI_STATION) || defined(CONFIG_ENABLE_WIFI_AP)
+#define CHIP_DEVICE_CONFIG_ENABLE_WPA 1
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_WPA 0
+#endif
+
+#ifdef CONFIG_ENABLE_MATTER_OVER_THREAD
+#define CHIP_ENABLE_OPENTHREAD 1
+#else
+#define CHIP_ENABLE_OPENTHREAD 0
+#endif
+
+#ifdef CONFIG_OPENTHREAD_FTD
+#define CHIP_DEVICE_CONFIG_THREAD_FTD 1
+#else
+#define CHIP_DEVICE_CONFIG_THREAD_FTD 0
+#endif
+
+#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 1
+#else
+#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 0
+#endif
+
+#define CHIP_DEVICE_CONFIG_USES_OTBR_POSIX_DBUS_STACK 0
+#define CHIP_STACK_LOCK_TRACKING_ENABLED 1
+#define CHIP_STACK_LOCK_TRACKING_ERROR_FATAL 1
+
+#ifdef CONFIG_ENABLE_ROTATING_DEVICE_ID
+#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 1
+#else
+#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 0
+#endif
+
+#define CHIP_DEVICE_CONFIG_RUN_AS_ROOT 1
+#define CHIP_DISABLE_PLATFORM_KVS 0
+
+#ifdef CONFIG_ENABLE_OTA_REQUESTOR
+#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 1
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 0
+#endif
+
+#ifdef CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
+#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 0
+#else
+#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 1
+#endif
+
+#define CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER 1
+#define CHIP_DEVICE_LAYER_TARGET_ESP32 1
+
+
+#define CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES 5
+#define CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG 0
+
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF 0
+
+#if defined(CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER) && defined(CONFIG_THREAD_NETWORK_ENDPOINT_ID)
+#define CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID CONFIG_THREAD_NETWORK_ENDPOINT_ID
+#else
+#define CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID 0
+#endif
+
+// For definitions for external platform
+#define CHIP_DEVICE_LAYER_TARGET ESP32_custom
+#define BLE_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/BlePlatformConfig.h>
+#define CHIP_DEVICE_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/CHIPDevicePlatformConfig.h>
+#define CHIP_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/CHIPPlatformConfig.h>
+#define INET_CONFIG_INCLUDE <platform/ESP32_custom/InetPlatformConfig.h>
+#define SYSTEM_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/SystemPlatformConfig.h>
+#define EXTERNAL_CONFIGURATIONMANAGERIMPL_HEADER <platform/ESP32_custom/ConfigurationManagerImpl.h>
+#define EXTERNAL_CHIPDEVICEPLATFORMEVENT_HEADER <platform/ESP32_custom/CHIPDevicePlatformEvent.h>
+#define EXTERNAL_CONNECTIVITYMANAGERIMPL_HEADER <platform/ESP32_custom/ConnectivityManagerImpl.h>
+#define EXTERNAL_BLEMANAGERIMPL_HEADER <platform/ESP32_custom/BLEManagerImpl.h>
+#define EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER <platform/ESP32_custom/KeyValueStoreManagerImpl.h>
+#define EXTERNAL_PLATFORMMANAGERIMPL_HEADER <platform/ESP32_custom/PlatformManagerImpl.h>
+#define EXTERNAL_THREADSTACKMANAGERIMPL_HEADER <platform/ESP32_custom/ThreadStackManagerImpl.h>
+#define EXTERNAL_ESP32UTILS_HEADER <platform/ESP32_custom/ESP32Utils.h>
+#define EXTERNAL_ESP32OTAIMAGEPROCESSORIMPL_HEADER <platform/ESP32_custom/OTAImageProcessorImpl.h>
+#define EXTERNAL_ESP32DEVICEINFOPROVIDER_HEADER <platform/ESP32_custom/ESP32DeviceInfoProvider.h>
+#define EXTERNAL_ESP32FACTORYDATAPROVIDER_HEADER <platform/ESP32_custom/ESP32FactoryDataProvider.h>
+#define EXTERNAL_ESP32SECURECERTDACPROVIDER_HEADER <platform/ESP32_custom/ESP32SecureCertDACProvider.h>
+#define EXTERNAL_ESP32SECURECERTDATAPROVIDER_HEADER <platform/ESP32_custom/ESP32SecureCertDataProvider.h>
+")
+endif()
diff --git a/generate-include-files.cmake b/generate-include-files.cmake
deleted file mode 100644
index 2bbc696c3..000000000
--- a/generate-include-files.cmake
+++ /dev/null
@@ -1,696 +0,0 @@
-# Generating FirmwareBuildTime.h
-execute_process(
-    COMMAND date "+%s"
-    OUTPUT_VARIABLE BUILD_SECONDS
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-math(EXPR BUILD_SECONDS "${BUILD_SECONDS} - (946684800)")
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/FirmwareBuildTime.h
-"#pragma once\n
-#define CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME_MATTER_EPOCH_S ${BUILD_SECONDS}
-")
-
-# Generating app/AppBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/AppBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-
-#ifdef CONFIG_CHIP_CONFIG_IM_PRETTY_PRINT
-#define CHIP_CONFIG_IM_PRETTY_PRINT 1
-#else
-#define CHIP_CONFIG_IM_PRETTY_PRINT 0
-#endif
-
-#define CHIP_CONFIG_IM_FORCE_FABRIC_QUOTA_CHECK 0
-#define CHIP_CONFIG_ENABLE_SESSION_RESUMPTION 1
-#define CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY 0
-
-#ifdef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
-#define CHIP_CONFIG_PERSIST_SUBSCRIPTIONS 0
-#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION 0
-#else
-#define CHIP_CONFIG_PERSIST_SUBSCRIPTIONS 1
-#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION 1
-#endif
-
-#ifdef CONFIG_ENABLE_MATTER_EVENT_LIST
-#define CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE 1
-#else
-#define CHIP_CONFIG_ENABLE_EVENTLIST_ATTRIBUTE 0
-#endif
-
-#ifdef CONFIG_DISABLE_READ_CLIENT
-#define CHIP_CONFIG_ENABLE_READ_CLIENT 0
-#else
-#define CHIP_CONFIG_ENABLE_READ_CLIENT 1
-#endif
-")
-
-# Generating app/icd/server/ICDServerBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/icd/server/ICDServerBuildConfig.h
-"#pragma once\n
-#ifdef CONFIG_ENABLE_ICD_SERVER
-#define CHIP_CONFIG_ENABLE_ICD_SERVER 1
-#else
-#define CHIP_CONFIG_ENABLE_ICD_SERVER 0
-#endif
-
-#define CHIP_CONFIG_ENABLE_ICD_LIT 0
-#define CHIP_CONFIG_ENABLE_ICD_CIP 0
-#define CHIP_CONFIG_ENABLE_ICD_UAT 0
-#define ICD_REPORT_ON_ENTER_ACTIVE_MODE 0
-#define ICD_MAX_NOTIFICATION_SUBSCRIBERS 1
-#define ICD_ENFORCE_SIT_SLOW_POLL_LIMIT 0
-")
-
-# Generating asn1/ASN1OID.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/asn1/ASN1OID.h
-"#pragma once\n
-#include <cstdint>
-#include <cstddef>
-#include <sdkconfig.h>\n
-namespace chip {
-    namespace ASN1 {
-    
-    enum OIDCategory
-    {
-        kOIDCategory_PubKeyAlgo = 0x0100,
-        kOIDCategory_SigAlgo = 0x0200,
-        kOIDCategory_AttributeType = 0x0300,
-        kOIDCategory_EllipticCurve = 0x0400,
-        kOIDCategory_Extension = 0x0500,
-        kOIDCategory_KeyPurpose = 0x0600,
-    
-        kOIDCategory_NotSpecified = 0,
-        kOIDCategory_Unknown = 0x0F00,
-        kOIDCategory_Mask = 0x0F00
-    };
-    
-    typedef uint16_t OID;
-    
-    enum
-    {
-        kOID_PubKeyAlgo_ECPublicKey = 0x0101,
-    
-        kOID_SigAlgo_ECDSAWithSHA256 = 0x0201,
-    
-        kOID_AttributeType_CommonName = 0x0301,
-        kOID_AttributeType_Surname = 0x0302,
-        kOID_AttributeType_SerialNumber = 0x0303,
-        kOID_AttributeType_CountryName = 0x0304,
-        kOID_AttributeType_LocalityName = 0x0305,
-        kOID_AttributeType_StateOrProvinceName = 0x0306,
-        kOID_AttributeType_OrganizationName = 0x0307,
-        kOID_AttributeType_OrganizationalUnitName = 0x0308,
-        kOID_AttributeType_Title = 0x0309,
-        kOID_AttributeType_Name = 0x030A,
-        kOID_AttributeType_GivenName = 0x030B,
-        kOID_AttributeType_Initials = 0x030C,
-        kOID_AttributeType_GenerationQualifier = 0x030D,
-        kOID_AttributeType_DNQualifier = 0x030E,
-        kOID_AttributeType_Pseudonym = 0x030F,
-        kOID_AttributeType_DomainComponent = 0x0310,
-        kOID_AttributeType_MatterNodeId = 0x0311,
-        kOID_AttributeType_MatterFirmwareSigningId = 0x0312,
-        kOID_AttributeType_MatterICACId = 0x0313,
-        kOID_AttributeType_MatterRCACId = 0x0314,
-        kOID_AttributeType_MatterFabricId = 0x0315,
-        kOID_AttributeType_MatterCASEAuthTag = 0x0316,
-    
-        kOID_EllipticCurve_prime256v1 = 0x0401,
-    
-        kOID_Extension_BasicConstraints = 0x0501,
-        kOID_Extension_KeyUsage = 0x0502,
-        kOID_Extension_ExtendedKeyUsage = 0x0503,
-        kOID_Extension_SubjectKeyIdentifier = 0x0504,
-        kOID_Extension_AuthorityKeyIdentifier = 0x0505,
-        kOID_Extension_CSRRequest = 0x0506,
-    
-        kOID_KeyPurpose_ServerAuth = 0x0601,
-        kOID_KeyPurpose_ClientAuth = 0x0602,
-        kOID_KeyPurpose_CodeSigning = 0x0603,
-        kOID_KeyPurpose_EmailProtection = 0x0604,
-        kOID_KeyPurpose_TimeStamping = 0x0605,
-        kOID_KeyPurpose_OCSPSigning = 0x0606,
-    
-        kOID_NotSpecified = 0,
-        kOID_Unknown = 0xFFFF,
-        kOID_EnumMask = 0x00FF
-    };
-    
-    struct OIDTableEntry
-    {
-        OID EnumVal;
-        const uint8_t *EncodedOID;
-        uint16_t EncodedOIDLen;
-    };
-    
-    struct OIDNameTableEntry
-    {
-        OID EnumVal;
-        const char *Name;
-    };
-    
-    extern const OIDTableEntry sOIDTable[];
-    extern const OIDNameTableEntry sOIDNameTable[];
-    extern const size_t sOIDTableSize;
-    
-    #ifdef ASN1_DEFINE_OID_TABLE
-    
-    static const uint8_t sOID_PubKeyAlgo_ECPublicKey[] = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01 };
-    static const uint8_t sOID_SigAlgo_ECDSAWithSHA256[] = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02 };
-    static const uint8_t sOID_AttributeType_CommonName[] = { 0x55, 0x04, 0x03 };
-    static const uint8_t sOID_AttributeType_Surname[] = { 0x55, 0x04, 0x04 };
-    static const uint8_t sOID_AttributeType_SerialNumber[] = { 0x55, 0x04, 0x05 };
-    static const uint8_t sOID_AttributeType_CountryName[] = { 0x55, 0x04, 0x06 };
-    static const uint8_t sOID_AttributeType_LocalityName[] = { 0x55, 0x04, 0x07 };
-    static const uint8_t sOID_AttributeType_StateOrProvinceName[] = { 0x55, 0x04, 0x08 };
-    static const uint8_t sOID_AttributeType_OrganizationName[] = { 0x55, 0x04, 0x0A };
-    static const uint8_t sOID_AttributeType_OrganizationalUnitName[] = { 0x55, 0x04, 0x0B };
-    static const uint8_t sOID_AttributeType_Title[] = { 0x55, 0x04, 0x0C };
-    static const uint8_t sOID_AttributeType_Name[] = { 0x55, 0x04, 0x29 };
-    static const uint8_t sOID_AttributeType_GivenName[] = { 0x55, 0x04, 0x2A };
-    static const uint8_t sOID_AttributeType_Initials[] = { 0x55, 0x04, 0x2B };
-    static const uint8_t sOID_AttributeType_GenerationQualifier[] = { 0x55, 0x04, 0x2C };
-    static const uint8_t sOID_AttributeType_DNQualifier[] = { 0x55, 0x04, 0x2E };
-    static const uint8_t sOID_AttributeType_Pseudonym[] = { 0x55, 0x04, 0x41 };
-    static const uint8_t sOID_AttributeType_DomainComponent[] = { 0x09, 0x92, 0x26, 0x89, 0x93, 0xF2, 0x2C, 0x64, 0x01, 0x19 };
-    static const uint8_t sOID_AttributeType_MatterNodeId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x01 };
-    static const uint8_t sOID_AttributeType_MatterFirmwareSigningId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x02 };
-    static const uint8_t sOID_AttributeType_MatterICACId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x03 };
-    static const uint8_t sOID_AttributeType_MatterRCACId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x04 };
-    static const uint8_t sOID_AttributeType_MatterFabricId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x05 };
-    static const uint8_t sOID_AttributeType_MatterCASEAuthTag[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x06 };
-    static const uint8_t sOID_EllipticCurve_prime256v1[] = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07 };
-    static const uint8_t sOID_Extension_BasicConstraints[] = { 0x55, 0x1D, 0x13 };
-    static const uint8_t sOID_Extension_KeyUsage[] = { 0x55, 0x1D, 0x0F };
-    static const uint8_t sOID_Extension_ExtendedKeyUsage[] = { 0x55, 0x1D, 0x25 };
-    static const uint8_t sOID_Extension_SubjectKeyIdentifier[] = { 0x55, 0x1D, 0x0E };
-    static const uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
-    static const uint8_t sOID_Extension_CSRRequest[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x0E };
-    static const uint8_t sOID_KeyPurpose_ServerAuth[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01 };
-    static const uint8_t sOID_KeyPurpose_ClientAuth[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02 };
-    static const uint8_t sOID_KeyPurpose_CodeSigning[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x03 };
-    static const uint8_t sOID_KeyPurpose_EmailProtection[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x04 };
-    static const uint8_t sOID_KeyPurpose_TimeStamping[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x08 };
-    static const uint8_t sOID_KeyPurpose_OCSPSigning[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x09 };
-    
-    
-    const OIDTableEntry sOIDTable[] =
-    {
-        { kOID_PubKeyAlgo_ECPublicKey, sOID_PubKeyAlgo_ECPublicKey, sizeof(sOID_PubKeyAlgo_ECPublicKey) },
-        { kOID_SigAlgo_ECDSAWithSHA256, sOID_SigAlgo_ECDSAWithSHA256, sizeof(sOID_SigAlgo_ECDSAWithSHA256) },
-        { kOID_AttributeType_CommonName, sOID_AttributeType_CommonName, sizeof(sOID_AttributeType_CommonName) },
-        { kOID_AttributeType_Surname, sOID_AttributeType_Surname, sizeof(sOID_AttributeType_Surname) },
-        { kOID_AttributeType_SerialNumber, sOID_AttributeType_SerialNumber, sizeof(sOID_AttributeType_SerialNumber) },
-        { kOID_AttributeType_CountryName, sOID_AttributeType_CountryName, sizeof(sOID_AttributeType_CountryName) },
-        { kOID_AttributeType_LocalityName, sOID_AttributeType_LocalityName, sizeof(sOID_AttributeType_LocalityName) },
-        { kOID_AttributeType_StateOrProvinceName, sOID_AttributeType_StateOrProvinceName, sizeof(sOID_AttributeType_StateOrProvinceName) },
-        { kOID_AttributeType_OrganizationName, sOID_AttributeType_OrganizationName, sizeof(sOID_AttributeType_OrganizationName) },
-        { kOID_AttributeType_OrganizationalUnitName, sOID_AttributeType_OrganizationalUnitName, sizeof(sOID_AttributeType_OrganizationalUnitName) },
-        { kOID_AttributeType_Title, sOID_AttributeType_Title, sizeof(sOID_AttributeType_Title) },
-        { kOID_AttributeType_Name, sOID_AttributeType_Name, sizeof(sOID_AttributeType_Name) },
-        { kOID_AttributeType_GivenName, sOID_AttributeType_GivenName, sizeof(sOID_AttributeType_GivenName) },
-        { kOID_AttributeType_Initials, sOID_AttributeType_Initials, sizeof(sOID_AttributeType_Initials) },
-        { kOID_AttributeType_GenerationQualifier, sOID_AttributeType_GenerationQualifier, sizeof(sOID_AttributeType_GenerationQualifier) },
-        { kOID_AttributeType_DNQualifier, sOID_AttributeType_DNQualifier, sizeof(sOID_AttributeType_DNQualifier) },
-        { kOID_AttributeType_Pseudonym, sOID_AttributeType_Pseudonym, sizeof(sOID_AttributeType_Pseudonym) },
-        { kOID_AttributeType_DomainComponent, sOID_AttributeType_DomainComponent, sizeof(sOID_AttributeType_DomainComponent) },
-        { kOID_AttributeType_MatterNodeId, sOID_AttributeType_MatterNodeId, sizeof(sOID_AttributeType_MatterNodeId) },
-        { kOID_AttributeType_MatterFirmwareSigningId, sOID_AttributeType_MatterFirmwareSigningId, sizeof(sOID_AttributeType_MatterFirmwareSigningId) },
-        { kOID_AttributeType_MatterICACId, sOID_AttributeType_MatterICACId, sizeof(sOID_AttributeType_MatterICACId) },
-        { kOID_AttributeType_MatterRCACId, sOID_AttributeType_MatterRCACId, sizeof(sOID_AttributeType_MatterRCACId) },
-        { kOID_AttributeType_MatterFabricId, sOID_AttributeType_MatterFabricId, sizeof(sOID_AttributeType_MatterFabricId) },
-        { kOID_AttributeType_MatterCASEAuthTag, sOID_AttributeType_MatterCASEAuthTag, sizeof(sOID_AttributeType_MatterCASEAuthTag) },
-        { kOID_EllipticCurve_prime256v1, sOID_EllipticCurve_prime256v1, sizeof(sOID_EllipticCurve_prime256v1) },
-        { kOID_Extension_BasicConstraints, sOID_Extension_BasicConstraints, sizeof(sOID_Extension_BasicConstraints) },
-        { kOID_Extension_KeyUsage, sOID_Extension_KeyUsage, sizeof(sOID_Extension_KeyUsage) },
-        { kOID_Extension_ExtendedKeyUsage, sOID_Extension_ExtendedKeyUsage, sizeof(sOID_Extension_ExtendedKeyUsage) },
-        { kOID_Extension_SubjectKeyIdentifier, sOID_Extension_SubjectKeyIdentifier, sizeof(sOID_Extension_SubjectKeyIdentifier) },
-        { kOID_Extension_AuthorityKeyIdentifier, sOID_Extension_AuthorityKeyIdentifier, sizeof(sOID_Extension_AuthorityKeyIdentifier) },
-        { kOID_Extension_CSRRequest, sOID_Extension_CSRRequest, sizeof(sOID_Extension_CSRRequest) },
-        { kOID_KeyPurpose_ServerAuth, sOID_KeyPurpose_ServerAuth, sizeof(sOID_KeyPurpose_ServerAuth) },
-        { kOID_KeyPurpose_ClientAuth, sOID_KeyPurpose_ClientAuth, sizeof(sOID_KeyPurpose_ClientAuth) },
-        { kOID_KeyPurpose_CodeSigning, sOID_KeyPurpose_CodeSigning, sizeof(sOID_KeyPurpose_CodeSigning) },
-        { kOID_KeyPurpose_EmailProtection, sOID_KeyPurpose_EmailProtection, sizeof(sOID_KeyPurpose_EmailProtection) },
-        { kOID_KeyPurpose_TimeStamping, sOID_KeyPurpose_TimeStamping, sizeof(sOID_KeyPurpose_TimeStamping) },
-        { kOID_KeyPurpose_OCSPSigning, sOID_KeyPurpose_OCSPSigning, sizeof(sOID_KeyPurpose_OCSPSigning) },
-        { kOID_NotSpecified, NULL, 0 }
-    };
-    
-    const size_t sOIDTableSize = sizeof(sOIDTable) / sizeof(OIDTableEntry);
-    
-    #endif // ASN1_DEFINE_OID_TABLE
-    
-    #ifdef ASN1_DEFINE_OID_NAME_TABLE
-    
-    const OIDNameTableEntry sOIDNameTable[] =
-    {
-        { kOID_PubKeyAlgo_ECPublicKey, \"ECPublicKey\" },
-        { kOID_SigAlgo_ECDSAWithSHA256, \"ECDSAWithSHA256\" },
-        { kOID_AttributeType_CommonName, \"CommonName\" },
-        { kOID_AttributeType_Surname, \"Surname\" },
-        { kOID_AttributeType_SerialNumber, \"SerialNumber\" },
-        { kOID_AttributeType_CountryName, \"CountryName\" },
-        { kOID_AttributeType_LocalityName, \"LocalityName\" },
-        { kOID_AttributeType_StateOrProvinceName, \"StateOrProvinceName\" },
-        { kOID_AttributeType_OrganizationName, \"OrganizationName\" },
-        { kOID_AttributeType_OrganizationalUnitName, \"OrganizationalUnitName\" },
-        { kOID_AttributeType_Title, \"Title\" },
-        { kOID_AttributeType_Name, \"Name\" },
-        { kOID_AttributeType_GivenName, \"GivenName\" },
-        { kOID_AttributeType_Initials, \"Initials\" },
-        { kOID_AttributeType_GenerationQualifier, \"GenerationQualifier\" },
-        { kOID_AttributeType_DNQualifier, \"DNQualifier\" },
-        { kOID_AttributeType_Pseudonym, \"Pseudonym\" },
-        { kOID_AttributeType_DomainComponent, \"DomainComponent\" },
-        { kOID_AttributeType_MatterNodeId, \"MatterNodeId\" },
-        { kOID_AttributeType_MatterFirmwareSigningId, \"MatterFirmwareSigningId\" },
-        { kOID_AttributeType_MatterICACId, \"MatterICACId\" },
-        { kOID_AttributeType_MatterRCACId, \"MatterRCACId\" },
-        { kOID_AttributeType_MatterFabricId, \"MatterFabricId\" },
-        { kOID_AttributeType_MatterCASEAuthTag, \"MatterCASEAuthTag\" },
-        { kOID_EllipticCurve_prime256v1, \"prime256v1\" },
-        { kOID_Extension_BasicConstraints, \"BasicConstraints\" },
-        { kOID_Extension_KeyUsage, \"KeyUsage\" },
-        { kOID_Extension_ExtendedKeyUsage, \"ExtendedKeyUsage\" },
-        { kOID_Extension_SubjectKeyIdentifier, \"SubjectKeyIdentifier\" },
-        { kOID_Extension_AuthorityKeyIdentifier, \"AuthorityKeyIdentifier\" },
-        { kOID_Extension_CSRRequest, \"CSRRequest\" },
-        { kOID_KeyPurpose_ServerAuth, \"ServerAuth\" },
-        { kOID_KeyPurpose_ClientAuth, \"ClientAuth\" },
-        { kOID_KeyPurpose_CodeSigning, \"CodeSigning\" },
-        { kOID_KeyPurpose_EmailProtection, \"EmailProtection\" },
-        { kOID_KeyPurpose_TimeStamping, \"TimeStamping\" },
-        { kOID_KeyPurpose_OCSPSigning, \"OCSPSigning\" },
-        { kOID_NotSpecified, NULL }
-    };
-    
-    #endif // ASN1_DEFINE_OID_NAME_TABLE
-    
-    } // namespace ASN1
-    } // namespace chip
-")
-
-# Generating ble/BleBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ble/BleBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#ifdef CONFIG_ENABLE_CHIPOBLE
-#define CONFIG_NETWORK_LAYER_BLE 1
-#else
-#define CONFIG_NETWORK_LAYER_BLE 0
-#endif
-
-#define CHIP_ENABLE_CHIPOBLE_TEST 0
-
-#ifndef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
-#define BLE_PLATFORM_CONFIG_INCLUDE <platform/ESP32/BlePlatformConfig.h>
-#endif
-")
-
-# Generating core/CHIPBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/core/CHIPBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#define CHIP_FUZZING_ENABLED 0
-
-#ifdef CONFIG_BUILD_CHIP_TESTS
-#define CHIP_CONFIG_TEST 1
-#else
-#define CHIP_CONFIG_TEST 0
-#endif
-
-#define CHIP_ERROR_LOGGING (CONFIG_LOG_DEFAULT_LEVEL >= 1)
-#define CHIP_PROGRESS_LOGGING (CONFIG_LOG_DEFAULT_LEVEL >= 3)
-#define CHIP_DETAIL_LOGGING (CONFIG_LOG_DEFAULT_LEVEL >= 4)
-#define CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE 256
-#define CHIP_AUTOMATION_LOGGING (CONFIG_LOG_DEFAULT_LEVEL >= 5)
-#define CHIP_PW_TOKENIZER_LOGGING 0
-#define CHIP_USE_PW_LOGGING 0
-#define CHIP_CONFIG_SHORT_ERROR_STR 1
-#define CHIP_CONFIG_ENABLE_ARG_PARSER 1
-#define CHIP_TARGET_STYLE_UNIX 0
-#define CHIP_TARGET_STYLE_EMBEDDED 1
-#define CHIP_CONFIG_MEMORY_MGMT_MALLOC 1
-#define HAVE_MALLOC 1
-#define HAVE_FREE 1
-#define HAVE_NEW 0
-#define CHIP_CONFIG_MEMORY_MGMT_PLATFORM 0
-#define CHIP_CONFIG_MEMORY_DEBUG_CHECKS 0
-#define CHIP_CONFIG_MEMORY_DEBUG_DMALLOC 0
-#define CHIP_CONFIG_PROVIDE_OBSOLESCENT_INTERFACES 0
-#define CHIP_CONFIG_TRANSPORT_TRACE_ENABLED 0
-#define CHIP_CONFIG_TRANSPORT_PW_TRACE_ENABLED 0
-#define CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST 0
-#define CHIP_CONFIG_MINMDNS_MAX_PARALLEL_RESOLVES 2
-#define CHIP_CONFIG_CANCELABLE_HAS_INFO_STRING_FIELD 0
-#define CHIP_CONFIG_BIG_ENDIAN_TARGET 0
-")
-
-# Generating crypto/CryptoBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto/CryptoBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#define CHIP_CRYPTO_MBEDTLS 1
-#define CHIP_CRYPTO_PSA 0
-#define CHIP_CRYPTO_OPENSSL 0
-#define CHIP_CRYPTO_BORINGSSL 0
-#define CHIP_CRYPTO_PLATFORM 0
-")
-
-# Generating inet/InetBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/inet/InetBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#define INET_CONFIG_TEST 0
-
-#ifdef CONFIG_DISABLE_IPV4
-#define INET_CONFIG_ENABLE_IPV4 0
-#else
-#define INET_CONFIG_ENABLE_IPV4 1
-#endif
-
-#define INET_CONFIG_ENABLE_TCP_ENDPOINT 1
-#define INET_CONFIG_ENABLE_UDP_ENDPOINT 1
-#define HAVE_LWIP_RAW_BIND_NETIF 1
-
-#ifndef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
-#define INET_PLATFORM_CONFIG_INCLUDE <platform/ESP32/InetPlatformConfig.h>
-#endif
-
-#define INET_TCP_END_POINT_IMPL_CONFIG_FILE <inet/TCPEndPointImplLwIP.h>
-#define INET_UDP_END_POINT_IMPL_CONFIG_FILE <inet/UDPEndPointImplLwIP.h>
-")
-
-# Generating lwip/lwip_buildconfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lwip/lwip_buildconfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#define HAVE_LWIP_UDP_BIND_NETIF 1
-")
-
-# Generating matter/tracing/build_config.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/matter/tracing/build_config.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#ifdef CONFIG_ENABLE_ESP_INSIGHTS_TRACE
-#define MATTER_TRACING_ENABLED 1
-#else
-#define MATTER_TRACING_ENABLED 0
-#endif
-")
-
-# Generating platform/CHIPDeviceBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/platform/CHIPDeviceBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-
-#if defined(CONFIG_ENABLE_WIFI_STATION) || defined(CONFIG_ENABLE_WIFI_AP)
-#define CHIP_DEVICE_CONFIG_ENABLE_WPA 1
-#else
-#define CHIP_DEVICE_CONFIG_ENABLE_WPA 0
-#endif
-
-#ifdef CONFIG_ENABLE_MATTER_OVER_THREAD
-#define CHIP_ENABLE_OPENTHREAD 1
-#else
-#define CHIP_ENABLE_OPENTHREAD 0
-#endif
-
-#ifdef CONFIG_OPENTHREAD_FTD
-#define CHIP_DEVICE_CONFIG_THREAD_FTD 1
-#else
-#define CHIP_DEVICE_CONFIG_THREAD_FTD 0
-#endif
-
-#define CHIP_STACK_LOCK_TRACKING_ENABLED 1
-#define CHIP_STACK_LOCK_TRACKING_ERROR_FATAL 1
-
-#ifdef CONFIG_ENABLE_ROTATING_DEVICE_ID
-#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 1
-#else
-#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 0
-#endif
-
-#define CHIP_DEVICE_CONFIG_RUN_AS_ROOT 1
-#define CHIP_DISABLE_PLATFORM_KVS 0
-
-#ifdef CONFIG_ENABLE_OTA_REQUESTOR
-#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 1
-#else
-#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 0
-#endif
-
-#ifdef CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
-#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 0
-#else
-#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 1
-#endif
-
-#define CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER 1
-#define CHIP_DEVICE_LAYER_TARGET_ESP32 1
-
-#ifdef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
-#define CHIP_DEVICE_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/CHIPDevicePlatformConfig.h>
-#define BLE_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/BlePlatformConfig.h>
-#define CHIP_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/CHIPPlatformConfig.h>
-#define SYSTEM_PLATFORM_CONFIG_INCLUDE <platform/ESP32_custom/SystemPlatformConfig.h>
-#define CHIP_DEVICE_LAYER_TARGET ESP32_custom
-#else
-#define CHIP_DEVICE_PLATFORM_CONFIG_INCLUDE <platform/ESP32/CHIPDevicePlatformConfig.h>
-#define CHIP_DEVICE_LAYER_TARGET ESP32
-#endif
-
-#define CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES 5
-")
-
-# Generating setup_payload/CHIPAdditionalDataPayloadBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/setup_payload/CHIPAdditionalDataPayloadBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#ifdef CONFIG_ENABLE_ROTATING_DEVICE_ID
-#define CHIP_ENABLE_ROTATING_DEVICE_ID 1
-#else
-#define CHIP_ENABLE_ROTATING_DEVICE_ID 0
-#endif
-")
-
-# Generating system/SystemBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/system/SystemBuildConfig.h
-"#pragma once\n
-#include <sdkconfig.h>\n
-#define CONFIG_DEVICE_LAYER 1
-
-#ifdef CONFIG_BUILD_CHIP_TESTS
-#define CHIP_SYSTEM_CONFIG_TEST 1
-#define CHIP_WITH_NLFAULTINJECTION 1
-#else
-#define CHIP_SYSTEM_CONFIG_TEST 0
-#define CHIP_WITH_NLFAULTINJECTION 0
-#endif
-
-#define CHIP_SYSTEM_CONFIG_USE_DISPATCH 0
-#define CHIP_SYSTEM_CONFIG_USE_LIBEV 0
-#define CHIP_SYSTEM_CONFIG_USE_LWIP 1
-#define CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT 0
-#define CHIP_SYSTEM_CONFIG_USE_SOCKETS 0
-#define CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK 0
-#define CHIP_SYSTEM_CONFIG_POSIX_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_FREERTOS_LOCKING 1
-#define CHIP_SYSTEM_CONFIG_MBED_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_CMSIS_RTOS_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_ZEPHYR_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_NO_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_PROVIDE_STATISTICS 1
-#define HAVE_CLOCK_GETTIME 1
-#define HAVE_CLOCK_SETTIME 1
-#define HAVE_GETTIMEOFDAY 0
-#define HAVE_SYS_TIME_H 1
-#define HAVE_NETINET_ICMP6_H 1
-#define HAVE_ICMP6_FILTER 1
-#define CONFIG_HAVE_VCBPRINTF 0
-#define CONFIG_HAVE_VSNPRINTF_EX 0
-#define HAVE_SYS_SOCKET_H 0
-
-#ifndef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
-#define CHIP_PLATFORM_CONFIG_INCLUDE <platform/ESP32/CHIPPlatformConfig.h>
-#define SYSTEM_PLATFORM_CONFIG_INCLUDE <platform/ESP32/SystemPlatformConfig.h>
-#endif
-
-#define CHIP_SYSTEM_LAYER_IMPL_CONFIG_FILE <system/SystemLayerImplFreeRTOS.h>
-#define CHIP_SYSTEM_CONFIG_MULTICAST_HOMING 0
-")
-
-# Generating CHIPVersion.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CHIPVersion.h
-"/*
- *
- *    Copyright (c) 2020 Project CHIP Authors
- *    All rights reserved.
- *
- *    Licensed under the Apache License, Version 2.0 (the \"License\");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an \"AS IS\" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-/**
- *    \@file
- *      This file defines constants and macros for introspecting and
- *      manipulating CHIP versions.
- *
- *      The constants and macros defined here may be used to, for ,
- *      example, conditionally-compile older, newer, or changed CHIP
- *      APIs based on the CHIP version. For example:
- *
- *          \@code
- *          #if CHIP_VERSION_CODE >= CHIP_VERSION_CODE_ENCODE(1, 5, 0)
- *              ...
- *          #else
- *              ...
- *          #endif
- *          \@endcode
- *
- */
-
-#pragma once
-
-#define _CHIP_VERSION_CODE_MAJOR_WIDTH     8
-#define _CHIP_VERSION_CODE_MINOR_WIDTH     8
-#define _CHIP_VERSION_CODE_PATCH_WIDTH     8
-
-#define _CHIP_VERSION_CODE_MAJOR_MASK     ((1 << _CHIP_VERSION_CODE_MAJOR_WIDTH)  - 1)
-#define _CHIP_VERSION_CODE_MINOR_MASK     ((1 << _CHIP_VERSION_CODE_MINOR_WIDTH)  - 1)
-#define _CHIP_VERSION_CODE_PATCH_MASK     ((1 << _CHIP_VERSION_CODE_PATCH_WIDTH)  - 1)
-
-#define _CHIP_VERSION_CODE_MAJOR_SHIFT    24
-#define _CHIP_VERSION_CODE_MINOR_SHIFT    16
-#define _CHIP_VERSION_CODE_PATCH_SHIFT     8
-
-/**
- *  \@def CHIP_VERSION_CODE_ENCODE(major, minor, patch)
- *
- *  \@brief
- *    Encode a CHIP version code from its constituent \@a major, \@a minor, and \@a patch
- *    components.
- *
- *    This macro may be used in conjunction with CHIP_VERSION_CODE to, for
- *    example, conditionally-compile older, newer, or changed CHIP APIs based
- *    on the CHIP version. For example:
- *
- *        \@code
- *        #if CHIP_VERSION_CODE >= CHIP_VERSION_CODE_ENCODE(1, 5, 0)
- *            ...
- *        #else
- *            ...
- *        #endif
- *        \@endcode
- *
- */
-#define CHIP_VERSION_CODE_ENCODE(major, minor, patch)                                   \
-    ((((major)  & _CHIP_VERSION_CODE_MAJOR_MASK)  << _CHIP_VERSION_CODE_MAJOR_SHIFT)  | \
-     (((minor)  & _CHIP_VERSION_CODE_MINOR_MASK)  << _CHIP_VERSION_CODE_MINOR_SHIFT)  | \
-     (((patch)  & _CHIP_VERSION_CODE_PATCH_MASK)  << _CHIP_VERSION_CODE_PATCH_SHIFT))
-
-/**
- *  \@def CHIP_VERSION_CODE_DECODE_MAJOR(code)
- *
- *  \@brief
- *    Decode a CHIP major version component from a CHIP version \@a code.
- *
- */
-#define CHIP_VERSION_CODE_DECODE_MAJOR(code)  (((code) >> _CHIP_VERSION_CODE_MAJOR_SHIFT)  & _CHIP_VERSION_CODE_MAJOR_MASK)
-
-/**
- *  \@def CHIP_VERSION_CODE_DECODE_MINOR(code)
- *
- *  \@brief
- *    Decode a CHIP minor version component from a CHIP version \@a code.
- *
- */
-#define CHIP_VERSION_CODE_DECODE_MINOR(code)  (((code) >> _CHIP_VERSION_CODE_MINOR_SHIFT)  & _CHIP_VERSION_CODE_MINOR_MASK)
-
-/**
- *  \@def CHIP_VERSION_CODE_DECODE_PATCH(code)
- *
- *  \@brief
- *    Decode a CHIP patch version component from a CHIP version \@a code.
- *
- */
-#define CHIP_VERSION_CODE_DECODE_PATCH(code)  (((code) >> _CHIP_VERSION_CODE_PATCH_SHIFT)  & _CHIP_VERSION_CODE_PATCH_MASK)
-
-/**
- *  \@def CHIP_VERSION_MAJOR
- *
- *  \@brief
- *    The CHIP version major component, as an unsigned integer.
- *
- */
-#define CHIP_VERSION_MAJOR               0
-
-/**
- *  \@def CHIP_VERSION_MINOR
- *
- *  \@brief
- *    The CHIP version minor component, as an unsigned integer.
- *
- */
-#define CHIP_VERSION_MINOR               0
-
-/**
- *  \@def CHIP_VERSION_PATCH
- *
- *  \@brief
- *    The CHIP version patch component, as an unsigned integer.
- *
- */
-#define CHIP_VERSION_PATCH               0
-
-/**
- *  \@def CHIP_VERSION_EXTRA
- *
- *  \@brief
- *    The CHIP version extra component, as a quoted C string.
- *
- */
-#define CHIP_VERSION_EXTRA               \"\"
-
-/**
- *  \@def CHIP_VERSION_STRING
- *
- *  \@brief
- *    The CHIP version, as a quoted C string.
- *
- */
-#define CHIP_VERSION_STRING              \"0.0.0\"
-
-/**
- *  \@def CHIP_VERSION_CODE
- *
- *  \@brief
- *    The CHIP version, including the major, minor, and patch components,
- *    encoded as an unsigned integer.
- *
- *    This macro may be used in conjunction with CHIP_VERSION_CODE_ENCODE
- *    to, for example, conditionally-compile older, newer, or changed CHIP
- *    APIs based on the CHIP version. For example:
- *
- *        \@code
- *        #if CHIP_VERSION_CODE >= CHIP_VERSION_CODE_ENCODE(1, 5, 0)
- *            ...
- *        #else
- *            ...
- *        #endif
- *        \@endcode
- *
- */
-#define CHIP_VERSION_CODE   CHIP_VERSION_CODE_ENCODE(CHIP_VERSION_MAJOR, CHIP_VERSION_MINOR, CHIP_VERSION_PATCH)
-")
diff --git a/idf_component.yml b/idf_component.yml
index 9c076c652..b2c7e05bb 100644
--- a/idf_component.yml
+++ b/idf_component.yml
@@ -1,5 +1,5 @@
 ## IDF Component Manager Manifest File
-version: 0.0.2
+version: 1.4.2
 description: Espressif's Matter SDK Component
 url: https://github.com/espressif/esp-matter
 files:
@@ -9,9 +9,9 @@ files:
         - "./CMakeLists.txt"
         - "./Kconfig"
         - "./LICENSE"
-        - "./generate-include-files.cmake"
-        - "./ota-image.cmake"
+        - "./managed_component_include/**/*"
         - "./README.md"
+        - "./CHANGELOG.md"
         - "./components/**/*"
         - "./connectedhomeip/connectedhomeip/config/esp32/components/chip/Kconfig"
         - "./connectedhomeip/connectedhomeip/config/esp32/components/chip/ota-image.cmake"
@@ -19,22 +19,30 @@ files:
         - "./connectedhomeip/connectedhomeip/src/access/examples/*.*"
         - "./connectedhomeip/connectedhomeip/src/app/*.*"
         - "./connectedhomeip/connectedhomeip/src/app/app-platform/**/*"
+        - "./connectedhomeip/connectedhomeip/src/app/cluster-building-blocks/*.*"
         - "./connectedhomeip/connectedhomeip/src/app/clusters/**/*"
-        - "./connectedhomeip/connectedhomeip/src/app/data-model/**/*"
+        - "./connectedhomeip/connectedhomeip/src/app/common/*.*"
+        - "./connectedhomeip/connectedhomeip/src/app/data-model/*.*"
+        - "./connectedhomeip/connectedhomeip/src/app/data-model-provider/*.*"
         - "./connectedhomeip/connectedhomeip/src/app/dynamic_server/**/*"
         - "./connectedhomeip/connectedhomeip/src/app/icd/**/*"
-        - "./connectedhomeip/connectedhomeip/src/app/MessageDef/**/*"
-        - "./connectedhomeip/connectedhomeip/src/app/reporting/**/*"
-        - "./connectedhomeip/connectedhomeip/src/app/server/**/*"
+        - "./connectedhomeip/connectedhomeip/src/app/MessageDef/*.*"
+        - "./connectedhomeip/connectedhomeip/src/app/reporting/*.*"
+        - "./connectedhomeip/connectedhomeip/src/app/server/*.*"
+        - "./connectedhomeip/connectedhomeip/src/app/server-cluster/*.*"
+        - "./connectedhomeip/connectedhomeip/src/app/storage/*.*"
         - "./connectedhomeip/connectedhomeip/src/app/util/**/*"
         - "./connectedhomeip/connectedhomeip/src/ble/*.*"
         - "./connectedhomeip/connectedhomeip/src/controller/*.*"
         - "./connectedhomeip/connectedhomeip/src/controller/python/chip/tlv/tlvlist.py"
+        - "./connectedhomeip/connectedhomeip/src/controller/python/chip/tlv/__init__.py"
         - "./connectedhomeip/connectedhomeip/src/credentials/*.*"
-        - "./connectedhomeip/connectedhomeip/src/credentials/attestation_verifier/**/*"
-        - "./connectedhomeip/connectedhomeip/src/credentials/examples/**/*"
+        - "./connectedhomeip/connectedhomeip/src/credentials/attestation_verifier/*.*"
+        - "./connectedhomeip/connectedhomeip/src/credentials/examples/*.*"
         - "./connectedhomeip/connectedhomeip/src/credentials/tests/CHIPAttCert_test_vectors.*"
         - "./connectedhomeip/connectedhomeip/src/crypto/*.*"
+        - "./connectedhomeip/connectedhomeip/src/data-model-providers/codegen/*.*"
+        - "./connectedhomeip/connectedhomeip/src/data-model-providers/endpoint/*.*"
         - "./connectedhomeip/connectedhomeip/src/include/**/*"
         - "./connectedhomeip/connectedhomeip/src/inet/*.*"
         - "./connectedhomeip/connectedhomeip/src/lib/address_resolve/*.*"
@@ -51,38 +59,49 @@ files:
         - "./connectedhomeip/connectedhomeip/src/platform/ESP32/**/*"
         - "./connectedhomeip/connectedhomeip/src/platform/logging/*.*"
         - "./connectedhomeip/connectedhomeip/src/platform/OpenThread/**/*"
-        - "./connectedhomeip/connectedhomeip/src/protocols/**/*"
+        - "./connectedhomeip/connectedhomeip/src/protocols/*.*"
+        - "./connectedhomeip/connectedhomeip/src/protocols/bdx/*.*"
+        - "./connectedhomeip/connectedhomeip/src/protocols/echo/*.*"
+        - "./connectedhomeip/connectedhomeip/src/protocols/interaction_model/*.*"
+        - "./connectedhomeip/connectedhomeip/src/protocols/secure_channel/*.*"
+        - "./connectedhomeip/connectedhomeip/src/protocols/user_directed_commissioning/*.*"
         - "./connectedhomeip/connectedhomeip/src/setup_payload/*.*"
         - "./connectedhomeip/connectedhomeip/src/system/*.*"
         - "./connectedhomeip/connectedhomeip/src/tracing/*.*"
+        - "./connectedhomeip/connectedhomeip/src/tracing/esp32_diagnostic_trace/**/*"
         - "./connectedhomeip/connectedhomeip/src/tracing/esp32_trace/**/*"
         - "./connectedhomeip/connectedhomeip/src/transport/*.*"
-        - "./connectedhomeip/connectedhomeip/src/transport/raw/**/*"
+        - "./connectedhomeip/connectedhomeip/src/transport/raw/*.*"
+        - "./connectedhomeip/connectedhomeip/src/transport/retransmit/*.*"
+        - "./connectedhomeip/connectedhomeip/src/wifipaf/*.*"
+        - "./connectedhomeip/connectedhomeip/third_party/jsoncpp/repo/include/**/*"
         - "./connectedhomeip/connectedhomeip/third_party/nlassert/repo/include/**/*"
         - "./connectedhomeip/connectedhomeip/third_party/nlfaultinjection/include/**/*"
         - "./connectedhomeip/connectedhomeip/third_party/nlfaultinjection/src/**/*"
         - "./connectedhomeip/connectedhomeip/third_party/nlio/repo/include/**/*"
         - "./connectedhomeip/connectedhomeip/zzz_generated/app-common/**/*"
+        - "./connectedhomeip/connectedhomeip/zzz_generated/chip-tool/zap-generated/cluster/logging/**/*"
+        - "./connectedhomeip/connectedhomeip/examples/chip-tool/commands/clusters/DataModelLogger.h"
+        - "./connectedhomeip/connectedhomeip/examples/chip-tool/commands/common/RemoteDataModelLogger.h"
 dependencies:
     espressif/mdns:
         version: "^1.1.0"
         rules:
             - if: "idf_version >=5.0"
-            - if: "target != esp32h2"
 
     espressif/esp_secure_cert_mgr:
-        version: "^2.3.0"
+        version: "^2.5.0"
         rules:
             - if: "idf_version >=4.3"
 
     espressif/esp_encrypted_img:
-        version: "2.1.0"
+        version: "2.3.0"
         require: public
         rules:
             - if: "idf_version >=4.4"
 
     espressif/esp_insights:
-        version: "1.0.1"
+        version: "^1.2.4"
         require: public
         # There is an issue with IDF-Component-Manager when ESP Insights is included.
         # Issue: https://github.com/project-chip/connectedhomeip/issues/29125
@@ -92,3 +111,19 @@ dependencies:
 
     espressif/json_parser: "~1.0.0"
     espressif/json_generator: "~1.1.0"
+
+    espressif/esp_rcp_update:
+        version: "~1.3.0"
+        rules:
+            - if: "idf_version >=5.0"
+
+    espressif/esp_delta_ota:
+        version: "^1.1.0"
+        require: public
+        rules:
+            - if: "idf_version >=4.3"
+
+    espressif/esp_wifi_remote:
+        version: "^0.7.0"
+        rules:
+            - if: "target in [esp32p4]"
\ No newline at end of file
diff --git a/managed_component_include/ASN1OID.h.cmake b/managed_component_include/ASN1OID.h.cmake
new file mode 100644
index 000000000..5616b776a
--- /dev/null
+++ b/managed_component_include/ASN1OID.h.cmake
@@ -0,0 +1,232 @@
+# Generating asn1/ASN1OID.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/asn1/ASN1OID.h
+"#pragma once\n
+#include <cstdint>
+#include <cstddef>
+#include <sdkconfig.h>\n
+namespace chip {
+    namespace ASN1 {
+    
+    enum OIDCategory
+    {
+        kOIDCategory_PubKeyAlgo = 0x0100,
+        kOIDCategory_SigAlgo = 0x0200,
+        kOIDCategory_AttributeType = 0x0300,
+        kOIDCategory_EllipticCurve = 0x0400,
+        kOIDCategory_Extension = 0x0500,
+        kOIDCategory_KeyPurpose = 0x0600,
+    
+        kOIDCategory_NotSpecified = 0,
+        kOIDCategory_Unknown = 0x0F00,
+        kOIDCategory_Mask = 0x0F00
+    };
+    
+    typedef uint16_t OID;
+    
+    enum
+    {
+        kOID_PubKeyAlgo_ECPublicKey = 0x0101,
+    
+        kOID_SigAlgo_ECDSAWithSHA256 = 0x0201,
+    
+        kOID_AttributeType_CommonName = 0x0301,
+        kOID_AttributeType_Surname = 0x0302,
+        kOID_AttributeType_SerialNumber = 0x0303,
+        kOID_AttributeType_CountryName = 0x0304,
+        kOID_AttributeType_LocalityName = 0x0305,
+        kOID_AttributeType_StateOrProvinceName = 0x0306,
+        kOID_AttributeType_OrganizationName = 0x0307,
+        kOID_AttributeType_OrganizationalUnitName = 0x0308,
+        kOID_AttributeType_Title = 0x0309,
+        kOID_AttributeType_Name = 0x030A,
+        kOID_AttributeType_GivenName = 0x030B,
+        kOID_AttributeType_Initials = 0x030C,
+        kOID_AttributeType_GenerationQualifier = 0x030D,
+        kOID_AttributeType_DNQualifier = 0x030E,
+        kOID_AttributeType_Pseudonym = 0x030F,
+        kOID_AttributeType_DomainComponent = 0x0310,
+        kOID_AttributeType_MatterNodeId = 0x0311,
+        kOID_AttributeType_MatterFirmwareSigningId = 0x0312,
+        kOID_AttributeType_MatterICACId = 0x0313,
+        kOID_AttributeType_MatterRCACId = 0x0314,
+        kOID_AttributeType_MatterFabricId = 0x0315,
+        kOID_AttributeType_MatterCASEAuthTag = 0x0316,
+        kOID_AttributeType_MatterVidVerificationSignerId = 0x0317,
+    
+        kOID_EllipticCurve_prime256v1 = 0x0401,
+    
+        kOID_Extension_BasicConstraints = 0x0501,
+        kOID_Extension_KeyUsage = 0x0502,
+        kOID_Extension_ExtendedKeyUsage = 0x0503,
+        kOID_Extension_SubjectKeyIdentifier = 0x0504,
+        kOID_Extension_AuthorityKeyIdentifier = 0x0505,
+        kOID_Extension_CSRRequest = 0x0506,
+    
+        kOID_KeyPurpose_ServerAuth = 0x0601,
+        kOID_KeyPurpose_ClientAuth = 0x0602,
+        kOID_KeyPurpose_CodeSigning = 0x0603,
+        kOID_KeyPurpose_EmailProtection = 0x0604,
+        kOID_KeyPurpose_TimeStamping = 0x0605,
+        kOID_KeyPurpose_OCSPSigning = 0x0606,
+    
+        kOID_NotSpecified = 0,
+        kOID_Unknown = 0xFFFF,
+        kOID_EnumMask = 0x00FF
+    };
+    
+    struct OIDTableEntry
+    {
+        OID EnumVal;
+        const uint8_t *EncodedOID;
+        uint16_t EncodedOIDLen;
+    };
+    
+    struct OIDNameTableEntry
+    {
+        OID EnumVal;
+        const char *Name;
+    };
+    
+    extern const OIDTableEntry sOIDTable[];
+    extern const OIDNameTableEntry sOIDNameTable[];
+    extern const size_t sOIDTableSize;
+    
+    #ifdef ASN1_DEFINE_OID_TABLE
+    
+    static const uint8_t sOID_PubKeyAlgo_ECPublicKey[] = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x02, 0x01 };
+    static const uint8_t sOID_SigAlgo_ECDSAWithSHA256[] = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x04, 0x03, 0x02 };
+    static const uint8_t sOID_AttributeType_CommonName[] = { 0x55, 0x04, 0x03 };
+    static const uint8_t sOID_AttributeType_Surname[] = { 0x55, 0x04, 0x04 };
+    static const uint8_t sOID_AttributeType_SerialNumber[] = { 0x55, 0x04, 0x05 };
+    static const uint8_t sOID_AttributeType_CountryName[] = { 0x55, 0x04, 0x06 };
+    static const uint8_t sOID_AttributeType_LocalityName[] = { 0x55, 0x04, 0x07 };
+    static const uint8_t sOID_AttributeType_StateOrProvinceName[] = { 0x55, 0x04, 0x08 };
+    static const uint8_t sOID_AttributeType_OrganizationName[] = { 0x55, 0x04, 0x0A };
+    static const uint8_t sOID_AttributeType_OrganizationalUnitName[] = { 0x55, 0x04, 0x0B };
+    static const uint8_t sOID_AttributeType_Title[] = { 0x55, 0x04, 0x0C };
+    static const uint8_t sOID_AttributeType_Name[] = { 0x55, 0x04, 0x29 };
+    static const uint8_t sOID_AttributeType_GivenName[] = { 0x55, 0x04, 0x2A };
+    static const uint8_t sOID_AttributeType_Initials[] = { 0x55, 0x04, 0x2B };
+    static const uint8_t sOID_AttributeType_GenerationQualifier[] = { 0x55, 0x04, 0x2C };
+    static const uint8_t sOID_AttributeType_DNQualifier[] = { 0x55, 0x04, 0x2E };
+    static const uint8_t sOID_AttributeType_Pseudonym[] = { 0x55, 0x04, 0x41 };
+    static const uint8_t sOID_AttributeType_DomainComponent[] = { 0x09, 0x92, 0x26, 0x89, 0x93, 0xF2, 0x2C, 0x64, 0x01, 0x19 };
+    static const uint8_t sOID_AttributeType_MatterNodeId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x01 };
+    static const uint8_t sOID_AttributeType_MatterFirmwareSigningId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x02 };
+    static const uint8_t sOID_AttributeType_MatterICACId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x03 };
+    static const uint8_t sOID_AttributeType_MatterRCACId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x04 };
+    static const uint8_t sOID_AttributeType_MatterFabricId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x05 };
+    static const uint8_t sOID_AttributeType_MatterCASEAuthTag[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x06 };
+    static const uint8_t sOID_AttributeType_MatterVidVerificationSignerId[] = { 0x2B, 0x06, 0x01, 0x04, 0x01, 0x82, 0xA2, 0x7C, 0x01, 0x07 };
+    static const uint8_t sOID_EllipticCurve_prime256v1[] = { 0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07 };
+    static const uint8_t sOID_Extension_BasicConstraints[] = { 0x55, 0x1D, 0x13 };
+    static const uint8_t sOID_Extension_KeyUsage[] = { 0x55, 0x1D, 0x0F };
+    static const uint8_t sOID_Extension_ExtendedKeyUsage[] = { 0x55, 0x1D, 0x25 };
+    static const uint8_t sOID_Extension_SubjectKeyIdentifier[] = { 0x55, 0x1D, 0x0E };
+    static const uint8_t sOID_Extension_AuthorityKeyIdentifier[] = { 0x55, 0x1D, 0x23 };
+    static const uint8_t sOID_Extension_CSRRequest[] = { 0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x09, 0x0E };
+    static const uint8_t sOID_KeyPurpose_ServerAuth[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x01 };
+    static const uint8_t sOID_KeyPurpose_ClientAuth[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x02 };
+    static const uint8_t sOID_KeyPurpose_CodeSigning[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x03 };
+    static const uint8_t sOID_KeyPurpose_EmailProtection[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x04 };
+    static const uint8_t sOID_KeyPurpose_TimeStamping[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x08 };
+    static const uint8_t sOID_KeyPurpose_OCSPSigning[] = { 0x2B, 0x06, 0x01, 0x05, 0x05, 0x07, 0x03, 0x09 };
+    
+    
+    const OIDTableEntry sOIDTable[] =
+    {
+        { kOID_PubKeyAlgo_ECPublicKey, sOID_PubKeyAlgo_ECPublicKey, sizeof(sOID_PubKeyAlgo_ECPublicKey) },
+        { kOID_SigAlgo_ECDSAWithSHA256, sOID_SigAlgo_ECDSAWithSHA256, sizeof(sOID_SigAlgo_ECDSAWithSHA256) },
+        { kOID_AttributeType_CommonName, sOID_AttributeType_CommonName, sizeof(sOID_AttributeType_CommonName) },
+        { kOID_AttributeType_Surname, sOID_AttributeType_Surname, sizeof(sOID_AttributeType_Surname) },
+        { kOID_AttributeType_SerialNumber, sOID_AttributeType_SerialNumber, sizeof(sOID_AttributeType_SerialNumber) },
+        { kOID_AttributeType_CountryName, sOID_AttributeType_CountryName, sizeof(sOID_AttributeType_CountryName) },
+        { kOID_AttributeType_LocalityName, sOID_AttributeType_LocalityName, sizeof(sOID_AttributeType_LocalityName) },
+        { kOID_AttributeType_StateOrProvinceName, sOID_AttributeType_StateOrProvinceName, sizeof(sOID_AttributeType_StateOrProvinceName) },
+        { kOID_AttributeType_OrganizationName, sOID_AttributeType_OrganizationName, sizeof(sOID_AttributeType_OrganizationName) },
+        { kOID_AttributeType_OrganizationalUnitName, sOID_AttributeType_OrganizationalUnitName, sizeof(sOID_AttributeType_OrganizationalUnitName) },
+        { kOID_AttributeType_Title, sOID_AttributeType_Title, sizeof(sOID_AttributeType_Title) },
+        { kOID_AttributeType_Name, sOID_AttributeType_Name, sizeof(sOID_AttributeType_Name) },
+        { kOID_AttributeType_GivenName, sOID_AttributeType_GivenName, sizeof(sOID_AttributeType_GivenName) },
+        { kOID_AttributeType_Initials, sOID_AttributeType_Initials, sizeof(sOID_AttributeType_Initials) },
+        { kOID_AttributeType_GenerationQualifier, sOID_AttributeType_GenerationQualifier, sizeof(sOID_AttributeType_GenerationQualifier) },
+        { kOID_AttributeType_DNQualifier, sOID_AttributeType_DNQualifier, sizeof(sOID_AttributeType_DNQualifier) },
+        { kOID_AttributeType_Pseudonym, sOID_AttributeType_Pseudonym, sizeof(sOID_AttributeType_Pseudonym) },
+        { kOID_AttributeType_DomainComponent, sOID_AttributeType_DomainComponent, sizeof(sOID_AttributeType_DomainComponent) },
+        { kOID_AttributeType_MatterNodeId, sOID_AttributeType_MatterNodeId, sizeof(sOID_AttributeType_MatterNodeId) },
+        { kOID_AttributeType_MatterFirmwareSigningId, sOID_AttributeType_MatterFirmwareSigningId, sizeof(sOID_AttributeType_MatterFirmwareSigningId) },
+        { kOID_AttributeType_MatterICACId, sOID_AttributeType_MatterICACId, sizeof(sOID_AttributeType_MatterICACId) },
+        { kOID_AttributeType_MatterRCACId, sOID_AttributeType_MatterRCACId, sizeof(sOID_AttributeType_MatterRCACId) },
+        { kOID_AttributeType_MatterFabricId, sOID_AttributeType_MatterFabricId, sizeof(sOID_AttributeType_MatterFabricId) },
+        { kOID_AttributeType_MatterCASEAuthTag, sOID_AttributeType_MatterCASEAuthTag, sizeof(sOID_AttributeType_MatterCASEAuthTag) },
+        { kOID_AttributeType_MatterVidVerificationSignerId, sOID_AttributeType_MatterVidVerificationSignerId, sizeof(sOID_AttributeType_MatterVidVerificationSignerId) },
+        { kOID_EllipticCurve_prime256v1, sOID_EllipticCurve_prime256v1, sizeof(sOID_EllipticCurve_prime256v1) },
+        { kOID_Extension_BasicConstraints, sOID_Extension_BasicConstraints, sizeof(sOID_Extension_BasicConstraints) },
+        { kOID_Extension_KeyUsage, sOID_Extension_KeyUsage, sizeof(sOID_Extension_KeyUsage) },
+        { kOID_Extension_ExtendedKeyUsage, sOID_Extension_ExtendedKeyUsage, sizeof(sOID_Extension_ExtendedKeyUsage) },
+        { kOID_Extension_SubjectKeyIdentifier, sOID_Extension_SubjectKeyIdentifier, sizeof(sOID_Extension_SubjectKeyIdentifier) },
+        { kOID_Extension_AuthorityKeyIdentifier, sOID_Extension_AuthorityKeyIdentifier, sizeof(sOID_Extension_AuthorityKeyIdentifier) },
+        { kOID_Extension_CSRRequest, sOID_Extension_CSRRequest, sizeof(sOID_Extension_CSRRequest) },
+        { kOID_KeyPurpose_ServerAuth, sOID_KeyPurpose_ServerAuth, sizeof(sOID_KeyPurpose_ServerAuth) },
+        { kOID_KeyPurpose_ClientAuth, sOID_KeyPurpose_ClientAuth, sizeof(sOID_KeyPurpose_ClientAuth) },
+        { kOID_KeyPurpose_CodeSigning, sOID_KeyPurpose_CodeSigning, sizeof(sOID_KeyPurpose_CodeSigning) },
+        { kOID_KeyPurpose_EmailProtection, sOID_KeyPurpose_EmailProtection, sizeof(sOID_KeyPurpose_EmailProtection) },
+        { kOID_KeyPurpose_TimeStamping, sOID_KeyPurpose_TimeStamping, sizeof(sOID_KeyPurpose_TimeStamping) },
+        { kOID_KeyPurpose_OCSPSigning, sOID_KeyPurpose_OCSPSigning, sizeof(sOID_KeyPurpose_OCSPSigning) },
+        { kOID_NotSpecified, NULL, 0 }
+    };
+    
+    const size_t sOIDTableSize = sizeof(sOIDTable) / sizeof(OIDTableEntry);
+    
+    #endif // ASN1_DEFINE_OID_TABLE
+    
+    #ifdef ASN1_DEFINE_OID_NAME_TABLE
+    
+    const OIDNameTableEntry sOIDNameTable[] =
+    {
+        { kOID_PubKeyAlgo_ECPublicKey, \"ECPublicKey\" },
+        { kOID_SigAlgo_ECDSAWithSHA256, \"ECDSAWithSHA256\" },
+        { kOID_AttributeType_CommonName, \"CommonName\" },
+        { kOID_AttributeType_Surname, \"Surname\" },
+        { kOID_AttributeType_SerialNumber, \"SerialNumber\" },
+        { kOID_AttributeType_CountryName, \"CountryName\" },
+        { kOID_AttributeType_LocalityName, \"LocalityName\" },
+        { kOID_AttributeType_StateOrProvinceName, \"StateOrProvinceName\" },
+        { kOID_AttributeType_OrganizationName, \"OrganizationName\" },
+        { kOID_AttributeType_OrganizationalUnitName, \"OrganizationalUnitName\" },
+        { kOID_AttributeType_Title, \"Title\" },
+        { kOID_AttributeType_Name, \"Name\" },
+        { kOID_AttributeType_GivenName, \"GivenName\" },
+        { kOID_AttributeType_Initials, \"Initials\" },
+        { kOID_AttributeType_GenerationQualifier, \"GenerationQualifier\" },
+        { kOID_AttributeType_DNQualifier, \"DNQualifier\" },
+        { kOID_AttributeType_Pseudonym, \"Pseudonym\" },
+        { kOID_AttributeType_DomainComponent, \"DomainComponent\" },
+        { kOID_AttributeType_MatterNodeId, \"MatterNodeId\" },
+        { kOID_AttributeType_MatterFirmwareSigningId, \"MatterFirmwareSigningId\" },
+        { kOID_AttributeType_MatterICACId, \"MatterICACId\" },
+        { kOID_AttributeType_MatterRCACId, \"MatterRCACId\" },
+        { kOID_AttributeType_MatterFabricId, \"MatterFabricId\" },
+        { kOID_AttributeType_MatterCASEAuthTag, \"MatterCASEAuthTag\" },
+        { kOID_AttributeType_MatterVidVerificationSignerId, \"MatterVidVerificationSignerId\" },
+        { kOID_EllipticCurve_prime256v1, \"prime256v1\" },
+        { kOID_Extension_BasicConstraints, \"BasicConstraints\" },
+        { kOID_Extension_KeyUsage, \"KeyUsage\" },
+        { kOID_Extension_ExtendedKeyUsage, \"ExtendedKeyUsage\" },
+        { kOID_Extension_SubjectKeyIdentifier, \"SubjectKeyIdentifier\" },
+        { kOID_Extension_AuthorityKeyIdentifier, \"AuthorityKeyIdentifier\" },
+        { kOID_Extension_CSRRequest, \"CSRRequest\" },
+        { kOID_KeyPurpose_ServerAuth, \"ServerAuth\" },
+        { kOID_KeyPurpose_ClientAuth, \"ClientAuth\" },
+        { kOID_KeyPurpose_CodeSigning, \"CodeSigning\" },
+        { kOID_KeyPurpose_EmailProtection, \"EmailProtection\" },
+        { kOID_KeyPurpose_TimeStamping, \"TimeStamping\" },
+        { kOID_KeyPurpose_OCSPSigning, \"OCSPSigning\" },
+        { kOID_NotSpecified, NULL }
+    };
+    
+    #endif // ASN1_DEFINE_OID_NAME_TABLE
+    
+    } // namespace ASN1
+    } // namespace chip
+")
diff --git a/managed_component_include/AccessBuildConfig.cmake b/managed_component_include/AccessBuildConfig.cmake
new file mode 100644
index 000000000..51ab16ef1
--- /dev/null
+++ b/managed_component_include/AccessBuildConfig.cmake
@@ -0,0 +1,11 @@
+# Generating access/AccessBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/access/AccessBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+
+#ifdef CONFIG_ENABLE_ACCESS_RESTRICTIONS
+#define CHIP_CONFIG_USE_ACCESS_RESTRICTIONS 1
+#else
+#define CHIP_CONFIG_USE_ACCESS_RESTRICTIONS 0
+#endif
+")
diff --git a/managed_component_include/AppBuildConfig.cmake b/managed_component_include/AppBuildConfig.cmake
new file mode 100644
index 000000000..2c7f5e86e
--- /dev/null
+++ b/managed_component_include/AppBuildConfig.cmake
@@ -0,0 +1,37 @@
+# Generating app/AppBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/AppBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+
+#ifdef CONFIG_CHIP_CONFIG_IM_PRETTY_PRINT
+#define CHIP_CONFIG_IM_PRETTY_PRINT 1
+#else
+#define CHIP_CONFIG_IM_PRETTY_PRINT 0
+#endif
+
+#define CHIP_CONFIG_IM_FORCE_FABRIC_QUOTA_CHECK 0
+#define CHIP_CONFIG_ENABLE_SESSION_RESUMPTION 1
+#define CHIP_CONFIG_ACCESS_CONTROL_POLICY_LOGGING_VERBOSITY 0
+
+#ifdef CONFIG_ENABLE_PERSIST_SUBSCRIPTIONS
+#define CHIP_CONFIG_PERSIST_SUBSCRIPTIONS 1
+#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION 1
+#else
+#define CHIP_CONFIG_PERSIST_SUBSCRIPTIONS 0
+#define CHIP_CONFIG_SUBSCRIPTION_TIMEOUT_RESUMPTION 0
+#endif
+
+#ifdef CONFIG_DISABLE_READ_CLIENT
+#define CHIP_CONFIG_ENABLE_READ_CLIENT 0
+#else
+#define CHIP_CONFIG_ENABLE_READ_CLIENT 1
+#endif
+
+#define CHIP_CONFIG_STATIC_GLOBAL_INTERACTION_MODEL_ENGINE 1
+#define TIME_SYNC_ENABLE_TSC_FEATURE 1
+#define NON_SPEC_COMPLIANT_OTA_ACTION_DELAY_FLOOR -1
+#define CHIP_DEVICE_CONFIG_DYNAMIC_SERVER 0
+#define CHIP_CONFIG_ENABLE_BUSY_HANDLING_FOR_OPERATIONAL_SESSION_SETUP 1
+#define CHIP_CONFIG_DATA_MODEL_EXTRA_LOGGING 0
+#define CHIP_CONFIG_TERMS_AND_CONDITIONS_REQUIRED 0
+")
diff --git a/managed_component_include/BleBuildConfig.cmake b/managed_component_include/BleBuildConfig.cmake
new file mode 100644
index 000000000..3404998ea
--- /dev/null
+++ b/managed_component_include/BleBuildConfig.cmake
@@ -0,0 +1,14 @@
+# Generating ble/BleBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ble/BleBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+#ifdef CONFIG_ENABLE_CHIPOBLE
+#define CONFIG_NETWORK_LAYER_BLE 1
+#else
+#define CONFIG_NETWORK_LAYER_BLE 0
+#endif
+
+#ifndef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
+#define BLE_PLATFORM_CONFIG_INCLUDE <platform/ESP32/BlePlatformConfig.h>
+#endif
+")
diff --git a/managed_component_include/CHIPAdditionalDataPayloadBuildConfig.cmake b/managed_component_include/CHIPAdditionalDataPayloadBuildConfig.cmake
new file mode 100644
index 000000000..c89fb165b
--- /dev/null
+++ b/managed_component_include/CHIPAdditionalDataPayloadBuildConfig.cmake
@@ -0,0 +1,10 @@
+# Generating setup_payload/CHIPAdditionalDataPayloadBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/setup_payload/CHIPAdditionalDataPayloadBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+#ifdef CONFIG_ENABLE_ROTATING_DEVICE_ID
+#define CHIP_ENABLE_ROTATING_DEVICE_ID 1
+#else
+#define CHIP_ENABLE_ROTATING_DEVICE_ID 0
+#endif
+")
diff --git a/managed_component_include/CHIPBuildConfig.cmake b/managed_component_include/CHIPBuildConfig.cmake
new file mode 100644
index 000000000..9620425ef
--- /dev/null
+++ b/managed_component_include/CHIPBuildConfig.cmake
@@ -0,0 +1,43 @@
+# Generating core/CHIPBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/core/CHIPBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+#define CHIP_FUZZING_ENABLED 0
+
+#ifdef CONFIG_BUILD_CHIP_TESTS
+#define CHIP_CONFIG_TEST 1
+#else
+#define CHIP_CONFIG_TEST 0
+#endif
+
+#define CHIP_ERROR_LOGGING (CONFIG_CHIP_LOG_DEFAULT_LEVEL >= 1)
+#define CHIP_PROGRESS_LOGGING (CONFIG_CHIP_LOG_DEFAULT_LEVEL >= 3)
+#define CHIP_DETAIL_LOGGING (CONFIG_CHIP_LOG_DEFAULT_LEVEL >= 4)
+#define CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE 256
+#define CHIP_AUTOMATION_LOGGING (CONFIG_CHIP_LOG_DEFAULT_LEVEL >= 5)
+#define CHIP_PW_TOKENIZER_LOGGING 0
+#define CHIP_EXCHANGE_NODE_ID_LOGGING 0
+#define CHIP_CONFIG_SHORT_ERROR_STR 1
+#define CHIP_CONFIG_ENABLE_ARG_PARSER 1
+#define CHIP_TARGET_STYLE_UNIX 0
+#define CHIP_TARGET_STYLE_EMBEDDED 1
+#define CHIP_CONFIG_MEMORY_MGMT_MALLOC 0
+#define HAVE_MALLOC 0
+#define HAVE_FREE 0
+#define HAVE_NEW 0
+#define CHIP_CONFIG_MEMORY_MGMT_PLATFORM 1
+#define CHIP_CONFIG_MEMORY_DEBUG_CHECKS 0
+#define CHIP_CONFIG_MEMORY_DEBUG_DMALLOC 0
+#define CHIP_CONFIG_PROVIDE_OBSOLESCENT_INTERFACES 0
+#define CHIP_CONFIG_TRANSPORT_TRACE_ENABLED 0
+#define CHIP_CONFIG_TRANSPORT_PW_TRACE_ENABLED 0
+#define CHIP_CONFIG_MINMDNS_DYNAMIC_OPERATIONAL_RESPONDER_LIST 0
+#define CHIP_CONFIG_MINMDNS_MAX_PARALLEL_RESOLVES 2
+#define CHIP_CONFIG_CANCELABLE_HAS_INFO_STRING_FIELD 0
+#define CHIP_CONFIG_BIG_ENDIAN_TARGET 0
+#define CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_WRITE 1
+#define CHIP_CONFIG_TLV_VALIDATE_CHAR_STRING_ON_READ 0
+#define CHIP_CONFIG_COMMAND_SENDER_BUILTIN_SUPPORT_FOR_BATCHED_COMMANDS 0
+#define CHIP_CONFIG_TEST_GOOGLETEST 0
+#define CHIP_CONFIG_MRP_ANALYTICS_ENABLED 0
+")
diff --git a/managed_component_include/CHIPDeviceBuildConfig.cmake b/managed_component_include/CHIPDeviceBuildConfig.cmake
new file mode 100644
index 000000000..0bac51eff
--- /dev/null
+++ b/managed_component_include/CHIPDeviceBuildConfig.cmake
@@ -0,0 +1,81 @@
+if (NOT CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM)
+# Generating platform/CHIPDeviceBuildConfig.h when external platform is not enabled.
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/platform/CHIPDeviceBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+
+#if defined(CONFIG_ENABLE_WIFI_STATION) || defined(CONFIG_ENABLE_WIFI_AP)
+#define CHIP_DEVICE_CONFIG_ENABLE_WPA 1
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_WPA 0
+#endif
+
+#ifdef CONFIG_ENABLE_MATTER_OVER_THREAD
+#define CHIP_ENABLE_OPENTHREAD 1
+#else
+#define CHIP_ENABLE_OPENTHREAD 0
+#endif
+
+#ifdef CONFIG_OPENTHREAD_FTD
+#define CHIP_DEVICE_CONFIG_THREAD_FTD 1
+#else
+#define CHIP_DEVICE_CONFIG_THREAD_FTD 0
+#endif
+
+#ifdef CONFIG_OPENTHREAD_BORDER_ROUTER
+#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 1
+#else
+#define CHIP_DEVICE_CONFIG_THREAD_BORDER_ROUTER 0
+#endif
+
+#define CHIP_DEVICE_CONFIG_USES_OTBR_POSIX_DBUS_STACK 0
+#define CHIP_STACK_LOCK_TRACKING_ENABLED 1
+#define CHIP_STACK_LOCK_TRACKING_ERROR_FATAL 1
+
+#ifdef CONFIG_ENABLE_ROTATING_DEVICE_ID
+#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 1
+#else
+#define CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING 0
+#endif
+
+#define CHIP_DEVICE_CONFIG_RUN_AS_ROOT 1
+#define CHIP_DISABLE_PLATFORM_KVS 0
+
+#ifdef CONFIG_ENABLE_OTA_REQUESTOR
+#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 1
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR 0
+#endif
+
+#ifdef CONFIG_ENABLE_ESP32_FACTORY_DATA_PROVIDER
+#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 0
+#else
+#define CHIP_USE_TRANSITIONAL_COMMISSIONABLE_DATA_PROVIDER 1
+#endif
+
+#define CHIP_USE_TRANSITIONAL_DEVICE_INSTANCE_INFO_PROVIDER 1
+#define CHIP_DEVICE_LAYER_TARGET_ESP32 1
+
+#ifndef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
+#define CHIP_DEVICE_PLATFORM_CONFIG_INCLUDE <platform/ESP32/CHIPDevicePlatformConfig.h>
+#define CHIP_DEVICE_LAYER_TARGET ESP32
+#endif
+
+#define CHIP_DEVICE_CONFIG_MAX_DISCOVERED_IP_ADDRESSES 5
+
+#if defined(CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER) && defined(CONFIG_THREAD_NETWORK_ENDPOINT_ID)
+#define CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID CONFIG_THREAD_NETWORK_ENDPOINT_ID
+#else
+#define CHIP_DEVICE_CONFIG_THREAD_NETWORK_ENDPOINT_ID 0
+#endif
+
+#define CHIP_DEVICE_CONFIG_ENABLE_DYNAMIC_MRP_CONFIG 0
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF 0
+#define CHIP_DEVICE_CONFIG_ENABLE_JOINT_FABRIC 0
+#ifdef CONFIG_ENABLE_CHIPOBLE
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 1
+#else
+#define CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE 0
+#endif
+")
+endif()
diff --git a/managed_component_include/CHIPVersion.cmake b/managed_component_include/CHIPVersion.cmake
new file mode 100644
index 000000000..5727ee854
--- /dev/null
+++ b/managed_component_include/CHIPVersion.cmake
@@ -0,0 +1,192 @@
+# Generating CHIPVersion.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/CHIPVersion.h
+"/*
+ *
+ *    Copyright (c) 2020 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the \"License\");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an \"AS IS\" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+/**
+ *    \@file
+ *      This file defines constants and macros for introspecting and
+ *      manipulating CHIP versions.
+ *
+ *      The constants and macros defined here may be used to, for ,
+ *      example, conditionally-compile older, newer, or changed CHIP
+ *      APIs based on the CHIP version. For example:
+ *
+ *          \@code
+ *          #if CHIP_VERSION_CODE >= CHIP_VERSION_CODE_ENCODE(1, 5, 0)
+ *              ...
+ *          #else
+ *              ...
+ *          #endif
+ *          \@endcode
+ *
+ */
+
+#pragma once
+
+#define _CHIP_VERSION_CODE_MAJOR_WIDTH     8
+#define _CHIP_VERSION_CODE_MINOR_WIDTH     8
+#define _CHIP_VERSION_CODE_PATCH_WIDTH     8
+
+#define _CHIP_VERSION_CODE_MAJOR_MASK     ((1 << _CHIP_VERSION_CODE_MAJOR_WIDTH)  - 1)
+#define _CHIP_VERSION_CODE_MINOR_MASK     ((1 << _CHIP_VERSION_CODE_MINOR_WIDTH)  - 1)
+#define _CHIP_VERSION_CODE_PATCH_MASK     ((1 << _CHIP_VERSION_CODE_PATCH_WIDTH)  - 1)
+
+#define _CHIP_VERSION_CODE_MAJOR_SHIFT    24
+#define _CHIP_VERSION_CODE_MINOR_SHIFT    16
+#define _CHIP_VERSION_CODE_PATCH_SHIFT     8
+
+/**
+ *  \@def CHIP_VERSION_CODE_ENCODE(major, minor, patch)
+ *
+ *  \@brief
+ *    Encode a CHIP version code from its constituent \@a major, \@a minor, and \@a patch
+ *    components.
+ *
+ *    This macro may be used in conjunction with CHIP_VERSION_CODE to, for
+ *    example, conditionally-compile older, newer, or changed CHIP APIs based
+ *    on the CHIP version. For example:
+ *
+ *        \@code
+ *        #if CHIP_VERSION_CODE >= CHIP_VERSION_CODE_ENCODE(1, 5, 0)
+ *            ...
+ *        #else
+ *            ...
+ *        #endif
+ *        \@endcode
+ *
+ */
+#define CHIP_VERSION_CODE_ENCODE(major, minor, patch)                                   \
+    ((((major)  & _CHIP_VERSION_CODE_MAJOR_MASK)  << _CHIP_VERSION_CODE_MAJOR_SHIFT)  | \
+     (((minor)  & _CHIP_VERSION_CODE_MINOR_MASK)  << _CHIP_VERSION_CODE_MINOR_SHIFT)  | \
+     (((patch)  & _CHIP_VERSION_CODE_PATCH_MASK)  << _CHIP_VERSION_CODE_PATCH_SHIFT))
+
+/**
+ *  \@def CHIP_VERSION_CODE_DECODE_MAJOR(code)
+ *
+ *  \@brief
+ *    Decode a CHIP major version component from a CHIP version \@a code.
+ *
+ */
+#define CHIP_VERSION_CODE_DECODE_MAJOR(code)  (((code) >> _CHIP_VERSION_CODE_MAJOR_SHIFT)  & _CHIP_VERSION_CODE_MAJOR_MASK)
+
+/**
+ *  \@def CHIP_VERSION_CODE_DECODE_MINOR(code)
+ *
+ *  \@brief
+ *    Decode a CHIP minor version component from a CHIP version \@a code.
+ *
+ */
+#define CHIP_VERSION_CODE_DECODE_MINOR(code)  (((code) >> _CHIP_VERSION_CODE_MINOR_SHIFT)  & _CHIP_VERSION_CODE_MINOR_MASK)
+
+/**
+ *  \@def CHIP_VERSION_CODE_DECODE_PATCH(code)
+ *
+ *  \@brief
+ *    Decode a CHIP patch version component from a CHIP version \@a code.
+ *
+ */
+#define CHIP_VERSION_CODE_DECODE_PATCH(code)  (((code) >> _CHIP_VERSION_CODE_PATCH_SHIFT)  & _CHIP_VERSION_CODE_PATCH_MASK)
+
+/**
+ *  \@def CHIP_VERSION_MAJOR
+ *
+ *  \@brief
+ *    The CHIP version major component, as an unsigned integer.
+ *
+ */
+#define CHIP_VERSION_MAJOR               0
+
+/**
+ *  \@def CHIP_VERSION_MINOR
+ *
+ *  \@brief
+ *    The CHIP version minor component, as an unsigned integer.
+ *
+ */
+#define CHIP_VERSION_MINOR               0
+
+/**
+ *  \@def CHIP_VERSION_PATCH
+ *
+ *  \@brief
+ *    The CHIP version patch component, as an unsigned integer.
+ *
+ */
+#define CHIP_VERSION_PATCH               0
+
+/**
+ *  \@def CHIP_VERSION_EXTRA
+ *
+ *  \@brief
+ *    The CHIP version extra component, as a quoted C string.
+ *
+ */
+#define CHIP_VERSION_EXTRA               \"\"
+
+/**
+ *  \@def CHIP_VERSION_STRING
+ *
+ *  \@brief
+ *    The CHIP version, as a quoted C string.
+ *
+ */
+#define CHIP_VERSION_STRING              \"0.0.0\"
+
+/**
+ *  \@def CHIP_VERSION_CODE
+ *
+ *  \@brief
+ *    The CHIP version, including the major, minor, and patch components,
+ *    encoded as an unsigned integer.
+ *
+ *    This macro may be used in conjunction with CHIP_VERSION_CODE_ENCODE
+ *    to, for example, conditionally-compile older, newer, or changed CHIP
+ *    APIs based on the CHIP version. For example:
+ *
+ *        \@code
+ *        #if CHIP_VERSION_CODE >= CHIP_VERSION_CODE_ENCODE(1, 5, 0)
+ *            ...
+ *        #else
+ *            ...
+ *        #endif
+ *        \@endcode
+ *
+ */
+#define CHIP_VERSION_CODE   CHIP_VERSION_CODE_ENCODE(CHIP_VERSION_MAJOR, CHIP_VERSION_MINOR, CHIP_VERSION_PATCH)
+")
+
+# Automatically added defines for script
+#define BLE_PROJECT_CONFIG_INCLUDE 1
+#define INET_PROJECT_CONFIG_INCLUDE 1
+#define LWIP_DEBUG 1
+#define CHIP_DEVICE_CONFIG_ENABLE_NFC 1
+#define CONFIG_CHIP_NFC_COMMISSIONING 1
+#define CHIP_DEVICE_PROJECT_CONFIG_INCLUDE 1
+#define CHIP_DEVICE_CONFIG_FIRWMARE_BUILD_DATE 1 // codespell:ignore
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI 1
+#define CHIP_DEVICE_LAYER_TARGET_NXP_ZEPHYR 1
+#define CHIP_DEVICE_ENABLE_DATA_MODEL 1
+#define CHIP_DEVICE_LAYER_TARGET_${possible_device_layer_target_define} 1
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION 1
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING 1
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 1
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 1
+#define CHIP_DEVICE_LAYER_NONE 1
+#define EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER 1
+#define SYSTEM_ENABLE_CLANG_THREAD_SAFETY_ANALYSIS 1 (configuration by gn 'is_clang')
diff --git a/managed_component_include/CryptoBuildConfig.cmake b/managed_component_include/CryptoBuildConfig.cmake
new file mode 100644
index 000000000..5a7d5621a
--- /dev/null
+++ b/managed_component_include/CryptoBuildConfig.cmake
@@ -0,0 +1,14 @@
+# Generating crypto/CryptoBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/crypto/CryptoBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+#define CHIP_CRYPTO_MBEDTLS 1
+#define CHIP_CRYPTO_PSA 0
+#define CHIP_CRYPTO_PSA_SPAKE2P 0
+#define CHIP_CRYPTO_KEYSTORE_PSA 0
+#define CHIP_CRYPTO_KEYSTORE_RAW 1
+#define CHIP_CRYPTO_KEYSTORE_APP 0
+#define CHIP_CRYPTO_OPENSSL 0
+#define CHIP_CRYPTO_BORINGSSL 0
+#define CHIP_CRYPTO_PLATFORM 0
+")
diff --git a/managed_component_include/FirmwareBuildTime.cmake b/managed_component_include/FirmwareBuildTime.cmake
new file mode 100644
index 000000000..0f6a3fd99
--- /dev/null
+++ b/managed_component_include/FirmwareBuildTime.cmake
@@ -0,0 +1,11 @@
+# Generating FirmwareBuildTime.h
+execute_process(
+    COMMAND date "+%s"
+    OUTPUT_VARIABLE BUILD_SECONDS
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+math(EXPR BUILD_SECONDS "${BUILD_SECONDS} - (946684800)")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/FirmwareBuildTime.h
+"#pragma once\n
+#define CHIP_DEVICE_CONFIG_FIRMWARE_BUILD_TIME_MATTER_EPOCH_S ${BUILD_SECONDS}
+")
diff --git a/managed_component_include/ICDServerBuildConfig.cmake b/managed_component_include/ICDServerBuildConfig.cmake
new file mode 100644
index 000000000..9e5e307e2
--- /dev/null
+++ b/managed_component_include/ICDServerBuildConfig.cmake
@@ -0,0 +1,42 @@
+# Generating app/icd/server/ICDServerBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/icd/server/ICDServerBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+#ifdef CONFIG_ENABLE_ICD_SERVER
+#define CHIP_CONFIG_ENABLE_ICD_SERVER 1
+#else
+#define CHIP_CONFIG_ENABLE_ICD_SERVER 0
+#endif
+
+#ifdef CONFIG_ENABLE_ICD_LIT
+#define CHIP_CONFIG_ENABLE_ICD_LIT 1
+#else
+#define CHIP_CONFIG_ENABLE_ICD_LIT 0
+#endif
+
+#ifdef CONFIG_ENABLE_ICD_CIP
+#define CHIP_CONFIG_ENABLE_ICD_CIP 1
+#else
+#define CHIP_CONFIG_ENABLE_ICD_CIP 0
+#endif
+
+#ifdef CONFIG_ENABLE_ICD_USER_ACTIVE_MODE_TRIGGER
+#define CHIP_CONFIG_ENABLE_ICD_UAT 1
+#else
+#define CHIP_CONFIG_ENABLE_ICD_UAT 0
+#endif
+
+#define CHIP_CONFIG_ENABLE_ICD_DSLS 0
+
+#ifdef CONFIG_ICD_REPORT_ON_ACTIVE_MODE
+#define ICD_REPORT_ON_ENTER_ACTIVE_MODE 1
+#else
+#define ICD_REPORT_ON_ENTER_ACTIVE_MODE 0
+#endif
+
+#ifdef CONFIG_ICD_MAX_NOTIFICATION_SUBSCRIBERS
+#define ICD_MAX_NOTIFICATION_SUBSCRIBERS CONFIG_ICD_MAX_NOTIFICATION_SUBSCRIBERS
+#else
+#define ICD_MAX_NOTIFICATION_SUBSCRIBERS 1
+#endif
+")
diff --git a/managed_component_include/InetBuildConfig.cmake b/managed_component_include/InetBuildConfig.cmake
new file mode 100644
index 000000000..284053249
--- /dev/null
+++ b/managed_component_include/InetBuildConfig.cmake
@@ -0,0 +1,28 @@
+# Generating inet/InetBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/inet/InetBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+
+#ifdef CONFIG_BUILD_CHIP_TESTS
+#define INET_CONFIG_TEST 1
+#else
+#define INET_CONFIG_TEST 0
+#endif
+
+#ifdef CONFIG_DISABLE_IPV4
+#define INET_CONFIG_ENABLE_IPV4 0
+#else
+#define INET_CONFIG_ENABLE_IPV4 1
+#endif
+
+#define INET_CONFIG_ENABLE_TCP_ENDPOINT 0
+#define INET_CONFIG_ENABLE_UDP_ENDPOINT 1
+#define HAVE_LWIP_RAW_BIND_NETIF 1
+
+#ifndef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
+#define INET_PLATFORM_CONFIG_INCLUDE <platform/ESP32/InetPlatformConfig.h>
+#endif
+
+#define INET_TCP_END_POINT_IMPL_CONFIG_FILE <inet/TCPEndPointImplLwIP.h>
+#define INET_UDP_END_POINT_IMPL_CONFIG_FILE <inet/UDPEndPointImplLwIP.h>
+")
diff --git a/managed_component_include/SystemBuildConfig.cmake b/managed_component_include/SystemBuildConfig.cmake
new file mode 100644
index 000000000..9ea5ad8d7
--- /dev/null
+++ b/managed_component_include/SystemBuildConfig.cmake
@@ -0,0 +1,45 @@
+# Generating system/SystemBuildConfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/system/SystemBuildConfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+#define CONFIG_DEVICE_LAYER 1
+
+#ifdef CONFIG_BUILD_CHIP_TESTS
+#define CHIP_SYSTEM_CONFIG_TEST 1
+#define CHIP_WITH_NLFAULTINJECTION 1
+#else
+#define CHIP_SYSTEM_CONFIG_TEST 0
+#define CHIP_WITH_NLFAULTINJECTION 0
+#endif
+
+#define CHIP_SYSTEM_CONFIG_USE_DISPATCH 0
+#define CHIP_SYSTEM_CONFIG_USE_LIBEV 0
+#define CHIP_SYSTEM_CONFIG_USE_LWIP 1
+#define CHIP_SYSTEM_CONFIG_USE_OPENTHREAD_ENDPOINT 0
+#define CHIP_SYSTEM_CONFIG_USE_SOCKETS 0
+#define CHIP_SYSTEM_CONFIG_USE_NETWORK_FRAMEWORK 0
+#define CHIP_SYSTEM_CONFIG_POSIX_LOCKING 0
+#define CHIP_SYSTEM_CONFIG_FREERTOS_LOCKING 1
+#define CHIP_SYSTEM_CONFIG_MBED_LOCKING 0
+#define CHIP_SYSTEM_CONFIG_CMSIS_RTOS_LOCKING 0
+#define CHIP_SYSTEM_CONFIG_ZEPHYR_LOCKING 0
+#define CHIP_SYSTEM_CONFIG_NO_LOCKING 0
+#define CHIP_SYSTEM_CONFIG_PROVIDE_STATISTICS 1
+#define HAVE_CLOCK_GETTIME 1
+#define HAVE_CLOCK_SETTIME 1
+#define HAVE_GETTIMEOFDAY 0
+#define HAVE_SYS_TIME_H 1
+#define HAVE_NETINET_ICMP6_H 1
+#define HAVE_ICMP6_FILTER 1
+#define CONFIG_HAVE_VCBPRINTF 0
+#define HAVE_SYS_SOCKET_H 0
+
+#ifndef CONFIG_CHIP_ENABLE_EXTERNAL_PLATFORM
+#define CHIP_PLATFORM_CONFIG_INCLUDE <platform/ESP32/CHIPPlatformConfig.h>
+#define SYSTEM_PLATFORM_CONFIG_INCLUDE <platform/ESP32/SystemPlatformConfig.h>
+// SYSTEM_PROJECT_CONFIG_INCLUDE and CHIP_PROJECT_CONFIG_INCLUDE are defined in CMakeLists.txt
+#endif
+
+#define CHIP_SYSTEM_LAYER_IMPL_CONFIG_FILE <system/SystemLayerImplFreeRTOS.h>
+#define CHIP_SYSTEM_CONFIG_MULTICAST_HOMING 0
+")
diff --git a/managed_component_include/build_config.cmake b/managed_component_include/build_config.cmake
new file mode 100644
index 000000000..6b4b0ae8a
--- /dev/null
+++ b/managed_component_include/build_config.cmake
@@ -0,0 +1,10 @@
+# Generating matter/tracing/build_config.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/matter/tracing/build_config.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+#if defined(CONFIG_ENABLE_ESP_INSIGHTS_TRACE) && !defined(CONFIG_IDF_TARGET_ESP32H2)
+#define MATTER_TRACING_ENABLED 1
+#else
+#define MATTER_TRACING_ENABLED 0
+#endif
+")
diff --git a/managed_component_include/lwip_buildconfig.cmake b/managed_component_include/lwip_buildconfig.cmake
new file mode 100644
index 000000000..f037c09a2
--- /dev/null
+++ b/managed_component_include/lwip_buildconfig.cmake
@@ -0,0 +1,5 @@
+# Generating lwip/lwip_buildconfig.h
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/lwip/lwip_buildconfig.h
+"#pragma once\n
+#include <sdkconfig.h>\n
+")
diff --git a/managed_component_include/unused.cmake b/managed_component_include/unused.cmake
new file mode 100644
index 000000000..117fc0dbb
--- /dev/null
+++ b/managed_component_include/unused.cmake
@@ -0,0 +1,21 @@
+# Automatically added defines for script
+#define BLE_PROJECT_CONFIG_INCLUDE 1
+#define INET_PROJECT_CONFIG_INCLUDE 1
+#define LWIP_DEBUG 1
+#define CHIP_DEVICE_CONFIG_ENABLE_NFC 1
+#define CONFIG_CHIP_NFC_COMMISSIONING 1
+#define CHIP_DEVICE_PROJECT_CONFIG_INCLUDE 1
+#define CHIP_DEVICE_CONFIG_FIRWMARE_BUILD_DATE 1 // codespell:ignore
+#define CHIP_DEVICE_CONFIG_ENABLE_WIFI 1
+#define CHIP_DEVICE_LAYER_TARGET_NXP_ZEPHYR 1
+#define CHIP_DEVICE_ENABLE_DATA_MODEL 1
+#define CHIP_DEVICE_LAYER_TARGET_${possible_device_layer_target_define} 1
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION 1
+#define CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING 1
+#define CHIP_DEVICE_CONFIG_DEVICE_VENDOR_ID 1
+#define CHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID 1
+#define CHIP_DEVICE_LAYER_NONE 1
+#define EXTERNAL_KEYVALUESTOREMANAGERIMPL_HEADER 1
+#define SYSTEM_ENABLE_CLANG_THREAD_SAFETY_ANALYSIS 1 (configuration by gn 'is_clang')
+#define CHIP_CONFIG_SKIP_APP_SPECIFIC_GENERATED_HEADER_INCLUDES 0
+#define CHIP_DEVICE_CONFIG_DYNAMIC_ENDPOINT_COUNT 0