diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec75a5f15..9108f57fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,7 @@ variables:
   - cd ${CI_PROJECT_DIR}
   - git clone ${ESP_THREAD_BR_REPO_URL}
   - cd ${BR_PATH}/examples/basic_thread_border_router
-  - git checkout 25cfe641
+  - git checkout f03f1ca
   - idf.py set-target esp32s3
   - idf.py build
 
@@ -164,7 +164,7 @@ build_esp_matter_examples_pytest_C6_idf_v5_1:
     when: always
     expire_in: 4 days
   variables:
-        IDF_VERSION: "ea5e0ff298e6257b31d8e0c81435e6d3937f04c7"
+        IDF_VERSION: "v5.1.1"
   script:
     - cd ${ESP_MATTER_PATH}
     - pip install -r tools/ci/requirements-build.txt
@@ -197,7 +197,7 @@ build_esp_matter_examples_pytest_H2_idf_v5_1:
     when: always
     expire_in: 4 days
   variables:
-        IDF_VERSION: "ea5e0ff298e6257b31d8e0c81435e6d3937f04c7"
+        IDF_VERSION: "v5.1.1"
   script:
     - *setup_ot_rcp
     - *setup_ot_br
@@ -221,7 +221,7 @@ build_esp_matter_examples_non_pytest_idf_v5_1:
     when: always
     expire_in: 4 days
   variables:
-        IDF_VERSION: "ea5e0ff298e6257b31d8e0c81435e6d3937f04c7"
+        IDF_VERSION: "v5.1.1"
   script:
     - *build_external_platform_example
     - cd ${ESP_MATTER_PATH}
diff --git a/README.md b/README.md
index a2c8345c8..6ae6db8c4 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Espressif's SDK for Matter is the official Matter development framework for ESP3
 
 - This SDK currently works with [v1.1-branch](https://github.com/project-chip/connectedhomeip/tree/v1.1-branch) of connectedhomeip.
 - For ESP32, ESP32-C3, and ESP32-S3, ESP-IDF [v5.0.1 release](https://github.com/espressif/esp-idf/releases/tag/v5.0.1) is required.
-- For ESP32-C2, ESP32-H2(preview) and ESP32-C6(preview) and Zigbee Bridge example, ESP-IDF branch at [commit ea5e0ff](https://github.com/espressif/esp-idf/tree/ea5e0ff) in branch release/v5.1 should be used.
+- For ESP32-C2, ESP32-H2 and ESP32-C6 and Zigbee Bridge example, ESP-IDF [v5.1.1 release](https://github.com/espressif/esp-idf/releases/tag/v5.1.1) is required.
 
 
 ## Documentation
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 0de309d90..614b09a61 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+# 29-August-2023
+
+- `ot_storage` partition is no longer required for Thread devices as the mechanism for storing data related to the Thread network has been changed in the `openthread` component in ESP-IDF.
+
 # 14-April-2023
 
 #### *Changed how attribute data is stored in NVS*
diff --git a/docs/en/developing.rst b/docs/en/developing.rst
index ccc17b79b..5fe91265b 100644
--- a/docs/en/developing.rst
+++ b/docs/en/developing.rst
@@ -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 ea5e0ff; git submodule update --init --recursive;
+      cd esp-idf; git checkout v5.1.1; git submodule update --init --recursive;
       ./install.sh
       cd ..
 
diff --git a/examples/generic_switch/main/app_priv.h b/examples/generic_switch/main/app_priv.h
index 2c0d76bf4..1b46649a9 100644
--- a/examples/generic_switch/main/app_priv.h
+++ b/examples/generic_switch/main/app_priv.h
@@ -59,18 +59,18 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_
                                       uint32_t attribute_id, esp_matter_attr_val_t *val);
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                  \
-    {                                                                                          \
-        .radio_mode = RADIO_MODE_NATIVE,                                                       \
+#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                           \
+    {                                                                                   \
+        .radio_mode = RADIO_MODE_NATIVE,                                                \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                                   \
-    {                                                                                          \
-        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                                     \
+#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                            \
+    {                                                                                   \
+        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                              \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                                   \
-    {                                                                                          \
-        .storage_partition_name = "ot_storage", .netif_queue_size = 10, .task_queue_size = 10, \
+#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                            \
+    {                                                                                   \
+        .storage_partition_name = "nvs", .netif_queue_size = 10, .task_queue_size = 10, \
     }
 #endif
diff --git a/examples/generic_switch/partitions_thread.csv b/examples/generic_switch/partitions_thread.csv
deleted file mode 100644
index 362679948..000000000
--- a/examples/generic_switch/partitions_thread.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
-esp_secure_cert,  0x3F,  ,0xd000,    0x2000, encrypted
-nvs,      data, nvs,      0x10000,   0xC000,
-nvs_keys, data, nvs_keys, ,          0x1000, encrypted
-otadata,  data, ota,      ,          0x2000
-phy_init, data, phy,      ,          0x1000,
-ota_0,    app, ota_0,     ,          0x1C0000,
-ota_1,    app, ota_1,     ,          0x1C0000,
-# For Wi-Fi device, this partition can be deleted.
-ot_storage,data, fat,     ,          0x2000,
diff --git a/examples/generic_switch/sdkconfig.defaults.esp32c6 b/examples/generic_switch/sdkconfig.defaults.esp32c6
index 461f446c3..97cd0133a 100644
--- a/examples/generic_switch/sdkconfig.defaults.esp32c6
+++ b/examples/generic_switch/sdkconfig.defaults.esp32c6
@@ -26,7 +26,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/generic_switch/sdkconfig.defaults.esp32h2 b/examples/generic_switch/sdkconfig.defaults.esp32h2
index 0a4d4149f..3533a4b66 100644
--- a/examples/generic_switch/sdkconfig.defaults.esp32h2
+++ b/examples/generic_switch/sdkconfig.defaults.esp32h2
@@ -27,7 +27,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/light/main/app_priv.h b/examples/light/main/app_priv.h
index c2a3ff49e..8768cc9f9 100644
--- a/examples/light/main/app_priv.h
+++ b/examples/light/main/app_priv.h
@@ -81,18 +81,18 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_
 esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id);
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                  \
-    {                                                                                          \
-        .radio_mode = RADIO_MODE_NATIVE,                                                       \
+#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                           \
+    {                                                                                   \
+        .radio_mode = RADIO_MODE_NATIVE,                                                \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                                   \
-    {                                                                                          \
-        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                                     \
+#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                            \
+    {                                                                                   \
+        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                              \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                                   \
-    {                                                                                          \
-        .storage_partition_name = "ot_storage", .netif_queue_size = 10, .task_queue_size = 10, \
+#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                            \
+    {                                                                                   \
+        .storage_partition_name = "nvs", .netif_queue_size = 10, .task_queue_size = 10, \
     }
 #endif
diff --git a/examples/light/partitions_thread.csv b/examples/light/partitions_thread.csv
deleted file mode 100644
index 362679948..000000000
--- a/examples/light/partitions_thread.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
-esp_secure_cert,  0x3F,  ,0xd000,    0x2000, encrypted
-nvs,      data, nvs,      0x10000,   0xC000,
-nvs_keys, data, nvs_keys, ,          0x1000, encrypted
-otadata,  data, ota,      ,          0x2000
-phy_init, data, phy,      ,          0x1000,
-ota_0,    app, ota_0,     ,          0x1C0000,
-ota_1,    app, ota_1,     ,          0x1C0000,
-# For Wi-Fi device, this partition can be deleted.
-ot_storage,data, fat,     ,          0x2000,
diff --git a/examples/light/sdkconfig.defaults.esp32c6 b/examples/light/sdkconfig.defaults.esp32c6
index ae631c7ba..c10ac5328 100644
--- a/examples/light/sdkconfig.defaults.esp32c6
+++ b/examples/light/sdkconfig.defaults.esp32c6
@@ -18,7 +18,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # Use minimal mDNS
 CONFIG_USE_MINIMAL_MDNS=y
diff --git a/examples/light/sdkconfig.defaults.esp32h2 b/examples/light/sdkconfig.defaults.esp32h2
index 0a4d4149f..3533a4b66 100644
--- a/examples/light/sdkconfig.defaults.esp32h2
+++ b/examples/light/sdkconfig.defaults.esp32h2
@@ -27,7 +27,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/light_switch/main/app_priv.h b/examples/light_switch/main/app_priv.h
index df4da43a4..0176ff948 100644
--- a/examples/light_switch/main/app_priv.h
+++ b/examples/light_switch/main/app_priv.h
@@ -27,18 +27,18 @@ typedef void *app_driver_handle_t;
 app_driver_handle_t app_driver_switch_init();
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                  \
-    {                                                                                          \
-        .radio_mode = RADIO_MODE_NATIVE,                                                       \
+#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                           \
+    {                                                                                   \
+        .radio_mode = RADIO_MODE_NATIVE,                                                \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                                   \
-    {                                                                                          \
-        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                                     \
+#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                            \
+    {                                                                                   \
+        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                              \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                                   \
-    {                                                                                          \
-        .storage_partition_name = "ot_storage", .netif_queue_size = 10, .task_queue_size = 10, \
+#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                            \
+    {                                                                                   \
+        .storage_partition_name = "nvs", .netif_queue_size = 10, .task_queue_size = 10, \
     }
 #endif
diff --git a/examples/light_switch/partitions_thread.csv b/examples/light_switch/partitions_thread.csv
deleted file mode 100644
index 362679948..000000000
--- a/examples/light_switch/partitions_thread.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
-esp_secure_cert,  0x3F,  ,0xd000,    0x2000, encrypted
-nvs,      data, nvs,      0x10000,   0xC000,
-nvs_keys, data, nvs_keys, ,          0x1000, encrypted
-otadata,  data, ota,      ,          0x2000
-phy_init, data, phy,      ,          0x1000,
-ota_0,    app, ota_0,     ,          0x1C0000,
-ota_1,    app, ota_1,     ,          0x1C0000,
-# For Wi-Fi device, this partition can be deleted.
-ot_storage,data, fat,     ,          0x2000,
diff --git a/examples/light_switch/sdkconfig.defaults.esp32c6 b/examples/light_switch/sdkconfig.defaults.esp32c6
index 9e05a47f3..0c65765db 100644
--- a/examples/light_switch/sdkconfig.defaults.esp32c6
+++ b/examples/light_switch/sdkconfig.defaults.esp32c6
@@ -26,7 +26,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/light_switch/sdkconfig.defaults.esp32h2 b/examples/light_switch/sdkconfig.defaults.esp32h2
index 0a4d4149f..3533a4b66 100644
--- a/examples/light_switch/sdkconfig.defaults.esp32h2
+++ b/examples/light_switch/sdkconfig.defaults.esp32h2
@@ -27,7 +27,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/zap_light/main/app_priv.h b/examples/zap_light/main/app_priv.h
index 7728ba092..11106ee68 100644
--- a/examples/zap_light/main/app_priv.h
+++ b/examples/zap_light/main/app_priv.h
@@ -77,18 +77,18 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_
 esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id);
 
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
-#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                                  \
-    {                                                                                          \
-        .radio_mode = RADIO_MODE_NATIVE,                                                       \
+#define ESP_OPENTHREAD_DEFAULT_RADIO_CONFIG()                                           \
+    {                                                                                   \
+        .radio_mode = RADIO_MODE_NATIVE,                                                \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                                   \
-    {                                                                                          \
-        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                                     \
+#define ESP_OPENTHREAD_DEFAULT_HOST_CONFIG()                                            \
+    {                                                                                   \
+        .host_connection_mode = HOST_CONNECTION_MODE_NONE,                              \
     }
 
-#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                                   \
-    {                                                                                          \
-        .storage_partition_name = "ot_storage", .netif_queue_size = 10, .task_queue_size = 10, \
+#define ESP_OPENTHREAD_DEFAULT_PORT_CONFIG()                                            \
+    {                                                                                   \
+        .storage_partition_name = "nvs", .netif_queue_size = 10, .task_queue_size = 10, \
     }
 #endif
diff --git a/examples/zap_light/partitions_thread.csv b/examples/zap_light/partitions_thread.csv
deleted file mode 100644
index 362679948..000000000
--- a/examples/zap_light/partitions_thread.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-# Note: Firmware partition offset needs to be 64K aligned, initial 36K (9 sectors) are reserved for bootloader and partition table
-esp_secure_cert,  0x3F,  ,0xd000,    0x2000, encrypted
-nvs,      data, nvs,      0x10000,   0xC000,
-nvs_keys, data, nvs_keys, ,          0x1000, encrypted
-otadata,  data, ota,      ,          0x2000
-phy_init, data, phy,      ,          0x1000,
-ota_0,    app, ota_0,     ,          0x1C0000,
-ota_1,    app, ota_1,     ,          0x1C0000,
-# For Wi-Fi device, this partition can be deleted.
-ot_storage,data, fat,     ,          0x2000,
diff --git a/examples/zap_light/sdkconfig.defaults.esp32h2 b/examples/zap_light/sdkconfig.defaults.esp32h2
index 0a4d4149f..3533a4b66 100644
--- a/examples/zap_light/sdkconfig.defaults.esp32h2
+++ b/examples/zap_light/sdkconfig.defaults.esp32h2
@@ -27,7 +27,7 @@ CONFIG_LWIP_IPV6_AUTOCONFIG=n
 
 # Use a custom partition table
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_thread.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 
 # LwIP config for OpenThread
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
diff --git a/examples/zigbee_bridge/main/idf_component.yml b/examples/zigbee_bridge/main/idf_component.yml
index fcc36a272..1d60ab379 100644
--- a/examples/zigbee_bridge/main/idf_component.yml
+++ b/examples/zigbee_bridge/main/idf_component.yml
@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 dependencies:
-  espressif/esp-zboss-lib: "~0.3.0"
-  espressif/esp-zigbee-lib: "~0.5.0"
+  espressif/esp-zboss-lib: "~0.5.0"
+  espressif/esp-zigbee-lib: "~0.7.0"
   ## Required IDF version
   idf:
     version: ">=5.0.0"