diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
index 3757d952b29fda..87533e0b09f17a 100644
--- a/.github/workflows/examples-esp32.yaml
+++ b/.github/workflows/examples-esp32.yaml
@@ -107,12 +107,15 @@ jobs:
                      esp32 c3devkit all-clusters-app \
                      example_binaries/esp32-build/chip-all-clusters-app.elf \
                      /tmp/bloat_reports/
+
             - name: Build example Pigweed App
               run: scripts/examples/esp_example.sh pigweed-app sdkconfig.defaults
-            - name: Build example Lighting App
-              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults
-            - name: Build example Lock App
-              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults
+
+            - name: Build example Lighting App (Target:ESP32H2)
+              run: scripts/examples/esp_example.sh lighting-app sdkconfig.defaults.esp32h2
+
+            - name: Build example Lock App (Target:ESP32C6)
+              run: scripts/examples/esp_example.sh lock-app sdkconfig.defaults.esp32c6
 
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports
@@ -156,3 +159,6 @@ jobs:
 
             - name: Build example OTA Provider App
               run: scripts/examples/esp_example.sh ota-provider-app sdkconfig.defaults
+
+            - name: Build example Light Switch App (Target:ESP32C3)
+              run: scripts/examples/esp_example.sh light-switch-app sdkconfig.defaults.esp32c3
diff --git a/examples/light-switch-app/esp32/sdkconfig.defaults.esp32c3 b/examples/light-switch-app/esp32/sdkconfig.defaults.esp32c3
new file mode 100644
index 00000000000000..4db6e947e506ba
--- /dev/null
+++ b/examples/light-switch-app/esp32/sdkconfig.defaults.esp32c3
@@ -0,0 +1,35 @@
+CONFIG_IDF_TARGET="esp32c3"
+CONFIG_IDF_TARGET_ESP32C3=y
+CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM=y
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+#enable BT
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+
+#enable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+#enable lwIP route hooks
+CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
+CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
+
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+
+# Enable HKDF in mbedtls
+CONFIG_MBEDTLS_HKDF_C=y
+
+# Move functions from IRAM to flash
+CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
diff --git a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2 b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
index c8d20b0e61339d..d5f98fc81d2393 100644
--- a/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
+++ b/examples/lighting-app/esp32/sdkconfig.defaults.esp32h2
@@ -14,6 +14,9 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # libsodium
 CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
 
+# Serial Flasher config
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
 
 # NIMBLE
 CONFIG_BT_ENABLED=y
diff --git a/examples/lock-app/esp32/sdkconfig.defaults.esp32c6 b/examples/lock-app/esp32/sdkconfig.defaults.esp32c6
new file mode 100644
index 00000000000000..b8d458e24fc0f9
--- /dev/null
+++ b/examples/lock-app/esp32/sdkconfig.defaults.esp32c6
@@ -0,0 +1,60 @@
+CONFIG_IDF_TARGET="esp32c6"
+
+# Default to 921600 baud when flashing and monitoring device
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y
+CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+
+# libsodium
+CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y
+
+# NIMBLE
+CONFIG_BT_ENABLED=y
+CONFIG_BT_NIMBLE_ENABLED=y
+CONFIG_BT_NIMBLE_EXT_ADV=n
+CONFIG_BT_NIMBLE_HCI_EVT_BUF_SIZE=70
+CONFIG_USE_BLE_ONLY_FOR_COMMISSIONING=n
+
+# Disable OpenThread
+CONFIG_OPENTHREAD_ENABLED=n
+
+# Disable lwip ipv6 autoconfig
+CONFIG_LWIP_IPV6_AUTOCONFIG=n
+
+# Use a custom partition table
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+# LwIP config for OpenThread
+CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
+CONFIG_LWIP_MULTICAST_PING=y
+
+# mbedTLS
+CONFIG_MBEDTLS_HARDWARE_AES=n
+CONFIG_MBEDTLS_HARDWARE_MPI=n
+CONFIG_MBEDTLS_HARDWARE_SHA=n
+CONFIG_MBEDTLS_HARDWARE_ECC=y
+CONFIG_MBEDTLS_CMAC_C=y
+CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y
+CONFIG_MBEDTLS_ECJPAKE_C=y
+
+# MDNS platform
+CONFIG_USE_MINIMAL_MDNS=y
+CONFIG_ENABLE_EXTENDED_DISCOVERY=y
+
+# FreeRTOS should use legacy API
+CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
+
+# Wi-Fi Settings
+CONFIG_ENABLE_WIFI_STATION=y
+CONFIG_ENABLE_WIFI_AP=n
+# Enable this to avoid implicit declaration of function 'esp_send_assoc_resp'
+CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
+
+# Enable HKDF in mbedtls
+CONFIG_MBEDTLS_HKDF_C=y