diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 232fa1042..3aad5dac5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ build_esp_matter_examples_pytest_C6_idf_v5_1:
     when: always
     expire_in: 4 days
   variables:
-        IDF_VERSION: "v5.1.1"
+        IDF_VERSION: "v5.2.1"
   script:
     - cd ${ESP_MATTER_PATH}
     - pip install -r tools/ci/requirements-build.txt
@@ -189,7 +189,7 @@ build_esp_matter_examples_pytest_H2_idf_v5_1:
     when: always
     expire_in: 4 days
   variables:
-        IDF_VERSION: "v5.1.1"
+        IDF_VERSION: "v5.2.1"
   script:
     - *setup_ot_rcp
     - *setup_ot_br
@@ -212,7 +212,7 @@ build_esp_matter_examples_non_pytest_idf_v5_1:
     when: always
     expire_in: 4 days
   variables:
-        IDF_VERSION: "v5.1.1"
+        IDF_VERSION: "v5.2.1"
   script:
     - *build_external_platform_example
     - cd ${ESP_MATTER_PATH}
diff --git a/README.md b/README.md
index 601a285d4..68992febb 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Espressif's SDK for Matter is the official Matter development framework for ESP3
 ## Supported ESP-IDF and connectedhomeip versions
 
 - This SDK currently works with [v1.1-branch](https://github.com/project-chip/connectedhomeip/tree/v1.1-branch) of connectedhomeip.
-- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [Release v5.1.1](https://github.com/espressif/esp-idf/tree/v5.1.1)
+- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [Release v5.2.1](https://github.com/espressif/esp-idf/tree/v5.2.1)
 
 
 ## Documentation
diff --git a/docs/en/developing.rst b/docs/en/developing.rst
index 5fe91265b..dc4fd7bf6 100644
--- a/docs/en/developing.rst
+++ b/docs/en/developing.rst
@@ -23,7 +23,7 @@ Additionally, we also support developing on Windows Host using WSL.
 
 The Prerequisites for ESP-IDF and Matter:
 
-- Please see `Prerequisites <https://docs.espressif.com/projects/esp-idf/en/v5.0.1/esp32/get-started/index.html#step-1-install-prerequisites>`__ for ESP IDF.
+- Please see `Prerequisites <https://docs.espressif.com/projects/esp-idf/en/v5.2.1/esp32/get-started/index.html#step-1-install-prerequisites>`__ for ESP IDF.
 - Please get the `Prerequisites <https://github.com/espressif/connectedhomeip/blob/v1.1-branch/docs/guides/BUILDING.md#prerequisites>`__ for Matter.
 
 
@@ -53,7 +53,7 @@ For using VSCode for development, please check `Developing in WSL <https://code.
    ::
 
       git clone --recursive https://github.com/espressif/esp-idf.git
-      cd esp-idf; git checkout v5.0.1; git submodule update --init --recursive;
+      cd esp-idf; git checkout v5.2.1; git submodule update --init --recursive;
       ./install.sh
       cd ..
 
@@ -62,7 +62,7 @@ For using VSCode for development, please check `Developing in WSL <https://code.
    ::
 
       git clone --recursive https://github.com/espressif/esp-idf.git
-      cd esp-idf; git checkout v5.1.1; git submodule update --init --recursive;
+      cd esp-idf; git checkout v5.2.1; git submodule update --init --recursive;
       ./install.sh
       cd ..
 
@@ -238,7 +238,7 @@ Choose IDF target.
    ::
 
       ERROR: This script was called from a virtual environment, can not create a virtual environment again
-          
+
    Run:
 
    ::
@@ -636,14 +636,14 @@ creating in the *app_main.cpp* of the example. Examples:
 -  on_off_light:
 
    ::
-   
+
       on_off_light::config_t light_config;
       endpoint_t *endpoint = on_off_light::create(node, &light_config, ENDPOINT_FLAG_NONE);
 
 -  fan:
 
    ::
-   
+
       fan::config_t fan_config;
       endpoint_t *endpoint = fan::create(node, &fan_config, ENDPOINT_FLAG_NONE);
 
@@ -681,7 +681,7 @@ creating in the *app_main.cpp* of the example. Examples:
 2.4.2.2 Clusters
 ^^^^^^^^^^^^^^^^
 
-Additional clusters can also be added to an endpoint. Examples: 
+Additional clusters can also be added to an endpoint. Examples:
 
 -  on_off:
 
@@ -700,7 +700,7 @@ Additional clusters can also be added to an endpoint. Examples:
 - window_covering:
 
       ::
-   
+
          window_covering::config_t window_covering_config(static_cast<uint8_t>(chip::app::Clusters::WindowCovering::EndProductType::kTiltOnlyInteriorBlind));
          cluster_t *cluster = window_covering::create(endpoint, &window_covering_config, CLUSTER_FLAG_SERVER);
 
@@ -723,7 +723,7 @@ Additional clusters can also be added to an endpoint. Examples:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Additional attributes and commands can also be added to a cluster.
-Examples: 
+Examples:
 
 -  attribute: on_off:
 
@@ -772,19 +772,19 @@ Non-Standard endpoint can be created, without any clusters.
 2.4.3.2 Clusters
 ^^^^^^^^^^^^^^^^
 
-Non-Standard/Custom clusters can also be created: 
+Non-Standard/Custom clusters can also be created:
 
 -  Cluster create:
 
    ::
-      
+
       uint32_t custom_cluster_id = 0x131bfc00;
       cluster_t *cluster = cluster::create(endpoint, custom_cluster_id, CLUSTER_FLAG_SERVER);
 
 2.4.3.3 Attributes and Commands
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Non-Standard/Custom attributes can also be created on any cluster: 
+Non-Standard/Custom attributes can also be created on any cluster:
 
 -  Attribute create:
 
diff --git a/examples/common/relinker/esp32c2/object.csv b/examples/common/relinker/esp32c2/object.csv
index e002b90c8..6cff4e5a5 100644
--- a/examples/common/relinker/esp32c2/object.csv
+++ b/examples/common/relinker/esp32c2/object.csv
@@ -44,7 +44,7 @@ libesp_wifi.a,esp_adapter.c.obj,esp-idf/esp_wifi/CMakeFiles/__idf_esp_wifi.dir/e
 libfreertos.a,list.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/list.c.obj
 libfreertos.a,port.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/riscv/port.c.obj
 libfreertos.a,port_common.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/port_common.c.obj
-libfreertos.a,port_systick.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/portable/port_systick.c.obj
+libfreertos.a,port_systick.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/port_systick.c.obj
 libfreertos.a,queue.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/queue.c.obj
 libfreertos.a,tasks.c.obj,esp-idf/freertos/CMakeFiles/__idf_freertos.dir/FreeRTOS-Kernel/tasks.c.obj
 libhal.a,brownout_hal.c.obj,esp-idf/hal/CMakeFiles/__idf_hal.dir/brownout_hal.c.obj