diff --git a/.github/workflows/upload_component.yml b/.github/workflows/upload_component.yml
index 83f7c481c..26b4b0b49 100644
--- a/.github/workflows/upload_component.yml
+++ b/.github/workflows/upload_component.yml
@@ -10,6 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: 'recursive'
       - name: Upload components to component service
         uses: espressif/upload-components-ci-action@v1
         with:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3315f962..37e48af0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,4 @@
-if(NOT MATTER_SDK_PATH)
-    get_filename_component(MATTER_SDK_PATH ${CMAKE_CURRENT_SOURCE_DIR}/connectedhomeip/connectedhomeip/ REALPATH)
-endif()
+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)
@@ -29,7 +27,6 @@ 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/icd/"
                   "${MATTER_SDK_PATH}/src/app/MessageDef"
                   "${MATTER_SDK_PATH}/src/app/reporting"
                   "${MATTER_SDK_PATH}/src/app/server"
@@ -105,6 +102,7 @@ set(EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/controller/ExamplePersistentStorag
                       "${MATTER_SDK_PATH}/src/lib/dnssd/minimal_mdns/AddressPolicy_LibNlImpl.cpp"
                       "${MATTER_SDK_PATH}/src/lib/dnssd/minimal_mdns/Logging.cpp"
                       "${MATTER_SDK_PATH}/src/lib/support/UnitTestRegistration.cpp"
+                      "${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-Simple.cpp"
@@ -370,9 +368,8 @@ if (NOT CONFIG_ENABLE_CHIPOBLE)
                                   "${MATTER_SDK_PATH}/src/ble/BtpEngine.cpp")
 endif()
 
-if(NOT CONFIG_ENABLE_ICD_SERVER)
-    list(APPEND EXCLUDE_SRCS_LIST "${MATTER_SDK_PATH}/src/app/icd/ICDManager.cpp"
-                                  "${MATTER_SDK_PATH}/src/app/icd/ICDNotifier.cpp")
+if(CONFIG_ENABLE_ICD_SERVER)
+    list(APPEND SRC_DIRS_LIST "${MATTER_SDK_PATH}/src/app/icd/server/")
 endif()
 
 idf_component_register(SRC_DIRS          ${SRC_DIRS_LIST}
@@ -441,10 +438,9 @@ target_link_libraries(${COMPONENT_LIB} INTERFACE -Wl,--start-group
                                                 ${chip_libraries}
                                                 -Wl,--end-group)
 
-# Build OTA image need a python package, leading a file change and distorying the hash of managed_components.
-# In next idf_component_manager release, this may be resolved by adding include/exclude for calculating component_hash.
+# TODO: Build OTA image need a python package, leading a file change and distorying the hash of managed_components.
 # Build Matter OTA image
-if (CONFIG_CHIP_OTA_IMAGE_BUILD)
+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
diff --git a/generate-include-files.cmake b/generate-include-files.cmake
index 64d4a8fe0..2bbc696c3 100644
--- a/generate-include-files.cmake
+++ b/generate-include-files.cmake
@@ -46,8 +46,8 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/AppBuildConfig.h
 #endif
 ")
 
-# Generating app/icd/ICDBuildConfig.h
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/icd/ICDBuildConfig.h
+# 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
@@ -55,6 +55,9 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/app/icd/ICDBuildConfig.h
 #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
diff --git a/idf_component.yml b/idf_component.yml
index ebad2a2b7..9c076c652 100644
--- a/idf_component.yml
+++ b/idf_component.yml
@@ -1,5 +1,5 @@
 ## IDF Component Manager Manifest File
-version: 0.0.1
+version: 0.0.2
 description: Espressif's Matter SDK Component
 url: https://github.com/espressif/esp-matter
 files:
@@ -29,7 +29,7 @@ files:
         - "./connectedhomeip/connectedhomeip/src/app/util/**/*"
         - "./connectedhomeip/connectedhomeip/src/ble/*.*"
         - "./connectedhomeip/connectedhomeip/src/controller/*.*"
-        - "./connectedhomeip/connectedhomeip/src/controller/python/chip/tlv/*.*"
+        - "./connectedhomeip/connectedhomeip/src/controller/python/chip/tlv/tlvlist.py"
         - "./connectedhomeip/connectedhomeip/src/credentials/*.*"
         - "./connectedhomeip/connectedhomeip/src/credentials/attestation_verifier/**/*"
         - "./connectedhomeip/connectedhomeip/src/credentials/examples/**/*"