diff --git a/components/esp_matter/CMakeLists.txt b/components/esp_matter/CMakeLists.txt
index 0ad91690f..3ddeeccbb 100644
--- a/components/esp_matter/CMakeLists.txt
+++ b/components/esp_matter/CMakeLists.txt
@@ -6,29 +6,60 @@ set(SRC_DIRS_LIST       "."
                         "${MATTER_SDK_PATH}/src/app/server"
                         "${MATTER_SDK_PATH}/src/app/util"
                         "${MATTER_SDK_PATH}/src/app/reporting"
-                        "${MATTER_SDK_PATH}/src/app/clusters/basic"
+                        "${MATTER_SDK_PATH}/src/app/clusters/access-control-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/account-login-server"
                         "${MATTER_SDK_PATH}/src/app/clusters/administrator-commissioning-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/application-basic-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/application-launcher-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/audio-output-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/barrier-control-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/basic"
+                        "${MATTER_SDK_PATH}/src/app/clusters/bindings"
+                        "${MATTER_SDK_PATH}/src/app/clusters/channel-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/color-control-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/content-launch-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/descriptor"
+                        "${MATTER_SDK_PATH}/src/app/clusters/diagnostic-logs-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/door-lock-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/ethernet-network-diagnostics-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/fixed-label-server"
                         "${MATTER_SDK_PATH}/src/app/clusters/general-commissioning-server"
                         "${MATTER_SDK_PATH}/src/app/clusters/general-diagnostics-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/fixed-label-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/user-label-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/ota-provider"
-                        "${MATTER_SDK_PATH}/src/app/clusters/ota-requestor"
+                        "${MATTER_SDK_PATH}/src/app/clusters/group-key-mgmt-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/groups-client"
+                        "${MATTER_SDK_PATH}/src/app/clusters/groups-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/identify-client"
+                        "${MATTER_SDK_PATH}/src/app/clusters/identify-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/keypad-input-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/level-control"
+                        "${MATTER_SDK_PATH}/src/app/clusters/low-power-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/media-input-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/media-playback-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/mode-select-server"
                         "${MATTER_SDK_PATH}/src/app/clusters/network-commissioning"
                         "${MATTER_SDK_PATH}/src/app/clusters/network-commissioning-old"
-                        "${MATTER_SDK_PATH}/src/app/clusters/diagnostic-logs-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/software-diagnostics-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/thread-network-diagnostics-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/wifi-network-diagnostics-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/occupancy-sensor-server"
                         "${MATTER_SDK_PATH}/src/app/clusters/on-off-server"
                         "${MATTER_SDK_PATH}/src/app/clusters/operational-credentials-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/descriptor"
-                        "${MATTER_SDK_PATH}/src/app/clusters/level-control"
-                        "${MATTER_SDK_PATH}/src/app/clusters/identify-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/groups-server"
-                        "${MATTER_SDK_PATH}/src/app/clusters/group-key-mgmt-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/ota-provider"
+                        "${MATTER_SDK_PATH}/src/app/clusters/ota-requestor"
+                        "${MATTER_SDK_PATH}/src/app/clusters/power-source-configuration-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/pump-configuration-and-control-client"
+                        "${MATTER_SDK_PATH}/src/app/clusters/pump-configuration-and-control-server"
                         "${MATTER_SDK_PATH}/src/app/clusters/scenes"
-                        "${MATTER_SDK_PATH}/src/app/clusters/color-control-server")
+                        "${MATTER_SDK_PATH}/src/app/clusters/scenes-client"
+                        "${MATTER_SDK_PATH}/src/app/clusters/software-diagnostics-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/switch-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/target-navigator-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/test-cluster-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/thermostat-client"
+                        "${MATTER_SDK_PATH}/src/app/clusters/thermostat-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/thermostat-user-interface-configuration-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/thread-network-diagnostics-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/user-label-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/wifi-network-diagnostics-server"
+                        "${MATTER_SDK_PATH}/src/app/clusters/window-covering-server"
+)
 
 set(INCLUDE_DIRS_LIST   "."
                         "zap_common"