diff --git a/components/esp_matter/esp_matter.h b/components/esp_matter/esp_matter.h
index 75d334a74..fda20102b 100644
--- a/components/esp_matter/esp_matter.h
+++ b/components/esp_matter/esp_matter.h
@@ -32,6 +32,7 @@ application.
 
 #include <app-common/zap-generated/att-storage.h>
 #include <app/server/Dnssd.h>
+#include <platform/CHIPDeviceEvent.h>
 #include <platform/CHIPDeviceLayer.h>
 
 namespace esp_matter {
@@ -104,8 +105,6 @@ typedef enum command_flags {
 
 } /* esp_matter */
 
-#include <platform/CHIPDeviceEvent.h>
-
 namespace chip {
 namespace DeviceLayer {
 namespace DeviceEventType {
@@ -115,9 +114,13 @@ namespace DeviceEventType {
  */
 enum
 {
+    /** Signals that Commissioning session has started */
     kCommissioningSessionStarted  = kRange_PublicPlatformSpecific + 0x1000,
+    /** Signals that Commissioning session has stopped */
     kCommissioningSessionStopped,
+    /** Signals that Commissioning window is now opend */
     kCommissioningWindowOpened,
+    /** Signals that Commissioning window is now closed  */
     kCommissioningWindowClosed,
 };
 
diff --git a/examples/blemesh_bridge/main/app_main.cpp b/examples/blemesh_bridge/main/app_main.cpp
index 4260af7b2..8fbe97ef6 100644
--- a/examples/blemesh_bridge/main/app_main.cpp
+++ b/examples/blemesh_bridge/main/app_main.cpp
@@ -29,17 +29,37 @@ using namespace esp_matter::attribute;
 static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 {
     switch (event->Type) {
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kInterfaceIpAddressChanged:
+    case chip::DeviceLayer::DeviceEventType::kInterfaceIpAddressChanged:
 #if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
         chip::app::DnssdServer::Instance().StartServer();
         esp_route_hook_init(esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"));
 #endif
         break;
 
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
+    case chip::DeviceLayer::DeviceEventType::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
         break;
 
+    case chip::DeviceLayer::DeviceEventType::kFailSafeTimerExpired:
+        ESP_LOGI(TAG, "Commissioning failed, fail safe timer expired");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStarted:
+        ESP_LOGI(TAG, "Commissioning session started");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStopped:
+        ESP_LOGI(TAG, "Commissioning session stopped");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowOpened:
+        ESP_LOGI(TAG, "Commissioning window opened");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowClosed:
+        ESP_LOGI(TAG, "Commissioning window closed");
+        break;
+
     default:
         break;
     }
diff --git a/examples/light/main/app_main.cpp b/examples/light/main/app_main.cpp
index ddf6937d0..a5592f1d0 100644
--- a/examples/light/main/app_main.cpp
+++ b/examples/light/main/app_main.cpp
@@ -30,17 +30,37 @@ using namespace chip::app::Clusters;
 static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 {
     switch (event->Type) {
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kInterfaceIpAddressChanged:
+    case chip::DeviceLayer::DeviceEventType::kInterfaceIpAddressChanged:
 #if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
         chip::app::DnssdServer::Instance().StartServer();
         esp_route_hook_init(esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"));
 #endif
         break;
 
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
+    case chip::DeviceLayer::DeviceEventType::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
         break;
 
+    case chip::DeviceLayer::DeviceEventType::kFailSafeTimerExpired:
+        ESP_LOGI(TAG, "Commissioning failed, fail safe timer expired");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStarted:
+        ESP_LOGI(TAG, "Commissioning session started");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStopped:
+        ESP_LOGI(TAG, "Commissioning session stopped");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowOpened:
+        ESP_LOGI(TAG, "Commissioning window opened");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowClosed:
+        ESP_LOGI(TAG, "Commissioning window closed");
+        break;
+
     default:
         break;
     }
diff --git a/examples/light_switch/main/app_main.cpp b/examples/light_switch/main/app_main.cpp
index aa8ff05f5..010c336ae 100644
--- a/examples/light_switch/main/app_main.cpp
+++ b/examples/light_switch/main/app_main.cpp
@@ -29,17 +29,37 @@ using namespace esp_matter::endpoint;
 static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 {
     switch (event->Type) {
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kInterfaceIpAddressChanged:
+    case chip::DeviceLayer::DeviceEventType::kInterfaceIpAddressChanged:
 #if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
         chip::app::DnssdServer::Instance().StartServer();
         esp_route_hook_init(esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"));
 #endif
         break;
 
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
+    case chip::DeviceLayer::DeviceEventType::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
         break;
 
+    case chip::DeviceLayer::DeviceEventType::kFailSafeTimerExpired:
+        ESP_LOGI(TAG, "Commissioning failed, fail safe timer expired");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStarted:
+        ESP_LOGI(TAG, "Commissioning session started");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStopped:
+        ESP_LOGI(TAG, "Commissioning session stopped");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowOpened:
+        ESP_LOGI(TAG, "Commissioning window opened");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowClosed:
+        ESP_LOGI(TAG, "Commissioning window closed");
+        break;
+
     default:
         break;
     }
diff --git a/examples/zap_light/main/app_main.cpp b/examples/zap_light/main/app_main.cpp
index d41923648..f16d63613 100644
--- a/examples/zap_light/main/app_main.cpp
+++ b/examples/zap_light/main/app_main.cpp
@@ -28,17 +28,37 @@ app_driver_handle_t light_handle = NULL;
 static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 {
     switch (event->Type) {
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kInterfaceIpAddressChanged:
+    case chip::DeviceLayer::DeviceEventType::kInterfaceIpAddressChanged:
 #if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
         chip::app::DnssdServer::Instance().StartServer();
         esp_route_hook_init(esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"));
 #endif
         break;
 
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
+    case chip::DeviceLayer::DeviceEventType::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
         break;
 
+    case chip::DeviceLayer::DeviceEventType::kFailSafeTimerExpired:
+        ESP_LOGI(TAG, "Commissioning failed, fail safe timer expired");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStarted:
+        ESP_LOGI(TAG, "Commissioning session started");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStopped:
+        ESP_LOGI(TAG, "Commissioning session stopped");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowOpened:
+        ESP_LOGI(TAG, "Commissioning window opened");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowClosed:
+        ESP_LOGI(TAG, "Commissioning window closed");
+        break;
+
     default:
         break;
     }
diff --git a/examples/zigbee_bridge/main/app_main.cpp b/examples/zigbee_bridge/main/app_main.cpp
index 1c1de2a19..bb40871dc 100644
--- a/examples/zigbee_bridge/main/app_main.cpp
+++ b/examples/zigbee_bridge/main/app_main.cpp
@@ -28,17 +28,37 @@ using namespace esp_matter::attribute;
 static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
 {
     switch (event->Type) {
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kInterfaceIpAddressChanged:
+    case chip::DeviceLayer::DeviceEventType::kInterfaceIpAddressChanged:
 #if !CHIP_DEVICE_CONFIG_ENABLE_THREAD
         chip::app::DnssdServer::Instance().StartServer();
         esp_route_hook_init(esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"));
 #endif
         break;
 
-    case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
+    case chip::DeviceLayer::DeviceEventType::kCommissioningComplete:
         ESP_LOGI(TAG, "Commissioning complete");
         break;
 
+    case chip::DeviceLayer::DeviceEventType::kFailSafeTimerExpired:
+        ESP_LOGI(TAG, "Commissioning failed, fail safe timer expired");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStarted:
+        ESP_LOGI(TAG, "Commissioning session started");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningSessionStopped:
+        ESP_LOGI(TAG, "Commissioning session stopped");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowOpened:
+        ESP_LOGI(TAG, "Commissioning window opened");
+        break;
+
+    case chip::DeviceLayer::DeviceEventType::kCommissioningWindowClosed:
+        ESP_LOGI(TAG, "Commissioning window closed");
+        break;
+
     default:
         break;
     }