diff --git a/device_hal/device/esp32s2_devkit_c/device.c b/device_hal/device/esp32s2_devkit_c/device.c
deleted file mode 100644
index 55c3f2748..000000000
--- a/device_hal/device/esp32s2_devkit_c/device.c
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2021 Espressif Systems (Shanghai) CO LTD
-//
-// 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
-
-#include <esp_log.h>
-#include <iot_button.h>
-#include <led_driver.h>
-
-#define LED_GPIO_PIN GPIO_NUM_8
-#define LED_CHANNEL 0 /* RMT_CHANNEL_0 */
-#define BUTTON_GPIO_PIN GPIO_NUM_0
-
-static const char *TAG = "device";
-
-led_driver_config_t led_driver_get_config()
-{
-    led_driver_config_t config = {
-        .gpio = LED_GPIO_PIN,
-        .channel = LED_CHANNEL,
-    };
-    return config;
-}
-
-button_config_t button_driver_get_config()
-{
-    button_config_t config = {
-        .type = BUTTON_TYPE_GPIO,
-        .gpio_button_config = {
-            .gpio_num = BUTTON_GPIO_PIN,
-            .active_level = 0,
-        }
-    };
-    return config;
-}
diff --git a/device_hal/device/esp32s2_devkit_c/esp_matter_device.cmake b/device_hal/device/esp32s2_devkit_c/esp_matter_device.cmake
deleted file mode 100644
index b35c0a420..000000000
--- a/device_hal/device/esp32s2_devkit_c/esp_matter_device.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-if (NOT ("${IDF_TARGET}" STREQUAL "esp32s2" ))
-    message(FATAL_ERROR "please set esp32s2 as the IDF_TARGET using 'idf.py set-target esp32s2'")
-endif()
-
-SET(device_type     esp32s2_devkit_c)
-SET(led_type        hollow_led)
-SET(button_type     iot)
-
-SET(extra_components_dirs_append "$ENV{ESP_MATTER_DEVICE_PATH}/../../led_driver"
-                                 "$ENV{ESP_MATTER_DEVICE_PATH}/../../button_driver/iot_button")
diff --git a/docs/_static/esp_matter_versions.js b/docs/_static/esp_matter_versions.js
index 08ca4b63d..2c7d8fcfb 100644
--- a/docs/_static/esp_matter_versions.js
+++ b/docs/_static/esp_matter_versions.js
@@ -3,11 +3,10 @@ var DOCUMENTATION_VERSIONS = {
               supported_targets: [ "esp32" ]
             },
   VERSIONS: [
-    { name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32s2", "esp32c3", "esp32s3", "esp32h2" ] },
+    { name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32c3", "esp32s3", "esp32h2" ] },
   ],
   IDF_TARGETS: [
      { text: "ESP32", value: "esp32" },
-     { text: "ESP32-S2", value: "esp32s2" },
      { text: "ESP32-S3", value: "esp32s3" },
      { text: "ESP32-C3", value: "esp32c3" },
      { text: "ESP32-H2", value: "esp32h2" },
diff --git a/docs/conf_common.py b/docs/conf_common.py
index 8de1aba5b..de69d9875 100644
--- a/docs/conf_common.py
+++ b/docs/conf_common.py
@@ -1,7 +1,7 @@
 from esp_docs.conf_docs import *  # noqa: F403,F401
 
 languages = ['en']
-idf_targets = ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32h2']
+idf_targets = ['esp32', 'esp32s3', 'esp32c3', 'esp32h2']
 
 extensions += ['sphinx_copybutton',
                # Needed as a trigger for running doxygen
diff --git a/docs/en/developing.rst b/docs/en/developing.rst
index 737f8a173..80e48383a 100644
--- a/docs/en/developing.rst
+++ b/docs/en/developing.rst
@@ -1,7 +1,7 @@
 2. Developing with ESP Matter
 =============================
 
-Please refer the :project_file:`Changelog <CHANGELOG.md>` to know more about
+Please refer the :project_file:`Release Notes <RELEASE_NOTES.txt>` to know more about
 ESP Matter releases
 
 2.1 Development Setup
diff --git a/examples/blemesh_bridge/CMakeLists.txt b/examples/blemesh_bridge/CMakeLists.txt
index 9c4dce7e3..9ad7d3037 100644
--- a/examples/blemesh_bridge/CMakeLists.txt
+++ b/examples/blemesh_bridge/CMakeLists.txt
@@ -11,8 +11,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32c3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
-    elseif("${IDF_TARGET}" STREQUAL "esp32s2")
-        set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32s3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
     else()
diff --git a/examples/light/CMakeLists.txt b/examples/light/CMakeLists.txt
index 19c0327a3..9aeef3e00 100644
--- a/examples/light/CMakeLists.txt
+++ b/examples/light/CMakeLists.txt
@@ -13,8 +13,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
     elseif("${IDF_TARGET}" STREQUAL "esp32h2")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
-    elseif("${IDF_TARGET}" STREQUAL "esp32s2")
-        set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32s3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
     else()
diff --git a/examples/light/main/CMakeLists.txt b/examples/light/main/CMakeLists.txt
index 3d78c6b5f..b9a2c8e4b 100644
--- a/examples/light/main/CMakeLists.txt
+++ b/examples/light/main/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode app_reset esp_matter_ota)
+set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode app_reset esp_matter_ota)
 
 idf_component_register(SRC_DIRS          "."
                       PRIV_INCLUDE_DIRS  "."
diff --git a/examples/light/main/app_main.cpp b/examples/light/main/app_main.cpp
index 975c6db0d..b5f807271 100644
--- a/examples/light/main/app_main.cpp
+++ b/examples/light/main/app_main.cpp
@@ -15,7 +15,6 @@
 #include <esp_matter_ota.h>
 #include <esp_route_hook.h>
 
-#include <app_ble.h>
 #include <app_priv.h>
 #include <app_qrcode.h>
 
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 
     case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
-        app_ble_disable();
         break;
 
     default:
diff --git a/examples/light_switch/CMakeLists.txt b/examples/light_switch/CMakeLists.txt
index a8c929291..669ad2260 100644
--- a/examples/light_switch/CMakeLists.txt
+++ b/examples/light_switch/CMakeLists.txt
@@ -13,8 +13,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
     elseif("${IDF_TARGET}" STREQUAL "esp32h2")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
-    elseif("${IDF_TARGET}" STREQUAL "esp32s2")
-        set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
     else()
         message(FATAL_ERROR "Unsupported IDF_TARGET")
     endif()
diff --git a/examples/light_switch/main/CMakeLists.txt b/examples/light_switch/main/CMakeLists.txt
index 3d78c6b5f..b9a2c8e4b 100644
--- a/examples/light_switch/main/CMakeLists.txt
+++ b/examples/light_switch/main/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode app_reset esp_matter_ota)
+set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode app_reset esp_matter_ota)
 
 idf_component_register(SRC_DIRS          "."
                       PRIV_INCLUDE_DIRS  "."
diff --git a/examples/light_switch/main/app_main.cpp b/examples/light_switch/main/app_main.cpp
index cbb7ab00c..29f2e8655 100644
--- a/examples/light_switch/main/app_main.cpp
+++ b/examples/light_switch/main/app_main.cpp
@@ -15,7 +15,6 @@
 #include <esp_matter_ota.h>
 #include <esp_route_hook.h>
 
-#include <app_ble.h>
 #include <app_priv.h>
 #include <app_qrcode.h>
 
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 
     case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
-        app_ble_disable();
         break;
 
     default:
diff --git a/examples/rainmaker_light/CMakeLists.txt b/examples/rainmaker_light/CMakeLists.txt
index 9e74260db..605d87ca7 100644
--- a/examples/rainmaker_light/CMakeLists.txt
+++ b/examples/rainmaker_light/CMakeLists.txt
@@ -11,8 +11,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32c3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
-    elseif("${IDF_TARGET}" STREQUAL "esp32s2")
-        set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32s3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
     else()
diff --git a/examples/rainmaker_light/main/CMakeLists.txt b/examples/rainmaker_light/main/CMakeLists.txt
index 759c5ec2e..d144c63df 100644
--- a/examples/rainmaker_light/main/CMakeLists.txt
+++ b/examples/rainmaker_light/main/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console esp_matter_rainmaker route_hook app_ble app_qrcode app_reset
+set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console esp_matter_rainmaker route_hook app_qrcode app_reset
                        esp_rainmaker)
 
 idf_component_register(SRC_DIRS          "."
diff --git a/examples/rainmaker_light/main/app_main.cpp b/examples/rainmaker_light/main/app_main.cpp
index a440a5f48..3abb5a22f 100644
--- a/examples/rainmaker_light/main/app_main.cpp
+++ b/examples/rainmaker_light/main/app_main.cpp
@@ -14,7 +14,6 @@
 #include <esp_matter_console.h>
 #include <esp_route_hook.h>
 
-#include <app_ble.h>
 #include <app_priv.h>
 #include <app_qrcode.h>
 #include <app_rainmaker.h>
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 
     case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
-        app_ble_disable();
         break;
 
     default:
diff --git a/examples/zap_light/CMakeLists.txt b/examples/zap_light/CMakeLists.txt
index 56e1f49c8..e836ac925 100644
--- a/examples/zap_light/CMakeLists.txt
+++ b/examples/zap_light/CMakeLists.txt
@@ -13,8 +13,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
     elseif("${IDF_TARGET}" STREQUAL "esp32h2")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
-    elseif("${IDF_TARGET}" STREQUAL "esp32s2")
-        set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32s3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
     else()
diff --git a/examples/zap_light/main/CMakeLists.txt b/examples/zap_light/main/CMakeLists.txt
index 90fca8cbf..3ac9120af 100644
--- a/examples/zap_light/main/CMakeLists.txt
+++ b/examples/zap_light/main/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode app_reset)
+set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode app_reset)
 
 idf_component_register(SRC_DIRS          "."
                       PRIV_INCLUDE_DIRS  "."
diff --git a/examples/zap_light/main/app_main.cpp b/examples/zap_light/main/app_main.cpp
index b7af8c452..415bd986e 100644
--- a/examples/zap_light/main/app_main.cpp
+++ b/examples/zap_light/main/app_main.cpp
@@ -14,7 +14,6 @@
 #include <esp_matter_console.h>
 #include <esp_route_hook.h>
 
-#include <app_ble.h>
 #include <app_priv.h>
 #include <app_qrcode.h>
 
@@ -36,7 +35,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 
     case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
-        app_ble_disable();
         break;
 
     default:
diff --git a/examples/zigbee_bridge/CMakeLists.txt b/examples/zigbee_bridge/CMakeLists.txt
index 2df36567c..8a6d6ac4e 100644
--- a/examples/zigbee_bridge/CMakeLists.txt
+++ b/examples/zigbee_bridge/CMakeLists.txt
@@ -11,8 +11,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32c3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
-    elseif("${IDF_TARGET}" STREQUAL "esp32s2")
-        set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
     elseif("${IDF_TARGET}" STREQUAL "esp32s3")
         set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
     else()
diff --git a/examples/zigbee_bridge/main/CMakeLists.txt b/examples/zigbee_bridge/main/CMakeLists.txt
index 403c7c4e2..b9158b4ee 100644
--- a/examples/zigbee_bridge/main/CMakeLists.txt
+++ b/examples/zigbee_bridge/main/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode esp_matter_ota app_bridge
+set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode esp_matter_ota app_bridge
                        esp-zboss-lib)
 
 idf_component_register(SRC_DIRS          "."
diff --git a/examples/zigbee_bridge/main/app_main.cpp b/examples/zigbee_bridge/main/app_main.cpp
index a26aedcf0..770fe50aa 100644
--- a/examples/zigbee_bridge/main/app_main.cpp
+++ b/examples/zigbee_bridge/main/app_main.cpp
@@ -15,7 +15,6 @@
 #include <esp_matter_ota.h>
 #include <esp_route_hook.h>
 
-#include <app_ble.h>
 #include <app_qrcode.h>
 #include <app_zboss.h>
 #include <app_bridged_device.h>
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 
     case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
-        app_ble_disable();
         break;
 
     default: