diff --git a/.gitlab/ci/build.yml b/.gitlab/ci/build.yml
index 93b9672d68..7a70c4aa5c 100644
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -221,6 +221,14 @@ build_examples_cmake_esp32s2:
   variables:
     IDF_TARGET: esp32s2
 
+build_examples_cmake_esp32s3:
+  extends:
+    - .build_examples_cmake_template
+    - .rules:build:example_test-esp32s3
+  parallel: 8
+  variables:
+    IDF_TARGET: esp32s3
+
 build_examples_cmake_esp32c3:
   extends:
     - .build_examples_cmake_template
diff --git a/.gitlab/ci/target-test.yml b/.gitlab/ci/target-test.yml
index 0e5b751076..ba5b740106 100644
--- a/.gitlab/ci/target-test.yml
+++ b/.gitlab/ci/target-test.yml
@@ -46,7 +46,7 @@
   extends:
     - .example_test_template
     - .rules:test:example_test-esp32
-variables:
+  variables:
     SUBMODULES_TO_FETCH: "all"
 
 test_weekend_mqtt:
diff --git a/examples/bluetooth/hci/controller_hci_uart_esp32c3/README.md b/examples/bluetooth/hci/controller_hci_uart_esp32c3/README.md
index 03534fcd27..edaf529c76 100644
--- a/examples/bluetooth/hci/controller_hci_uart_esp32c3/README.md
+++ b/examples/bluetooth/hci/controller_hci_uart_esp32c3/README.md
@@ -1,7 +1,8 @@
+| Supported Targets | ESP32-C3 |
+| ----------------- | -------- |
+
 ESP-IDF UART HCI Controller
 =================================
-| Supported Targets | ESP32-C3 | ESP32-S3 |
-| ----------------- | -------- | -------- |
 
 This example demonstrates how to configure the Bluetooth Low Energy Controller's HCI (Host Controller Interface) to communicate over UART.
 
diff --git a/examples/ethernet/basic/README.md b/examples/ethernet/basic/README.md
index 49961a0266..0606572602 100644
--- a/examples/ethernet/basic/README.md
+++ b/examples/ethernet/basic/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # Ethernet Example
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
 
diff --git a/examples/ethernet/eth2ap/README.md b/examples/ethernet/eth2ap/README.md
index 13bd9aa0b9..31722dbafa 100644
--- a/examples/ethernet/eth2ap/README.md
+++ b/examples/ethernet/eth2ap/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # eth2ap Example
 (See the README.md file in the upper level 'examples' directory for more information about examples. To try a more complex application about Ethernet to WiFi data forwarding, please go to [iot-solution](https://github.com/espressif/esp-iot-solution/tree/release/v1.0/examples/eth2wifi).)
 
diff --git a/examples/ethernet/iperf/README.md b/examples/ethernet/iperf/README.md
index 3d8bf3149d..bdb29819cf 100644
--- a/examples/ethernet/iperf/README.md
+++ b/examples/ethernet/iperf/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # Ethernet iperf Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/peripherals/spi_master/lcd/README.md b/examples/peripherals/spi_master/lcd/README.md
index e848e1938c..d19418d534 100644
--- a/examples/peripherals/spi_master/lcd/README.md
+++ b/examples/peripherals/spi_master/lcd/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # SPI Host Driver Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/protocols/http_server/file_serving/README.md b/examples/protocols/http_server/file_serving/README.md
index dd14afb980..1ec08d2546 100644
--- a/examples/protocols/http_server/file_serving/README.md
+++ b/examples/protocols/http_server/file_serving/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # Simple HTTP File Server Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/provisioning/wifi_prov_mgr/README.md b/examples/provisioning/wifi_prov_mgr/README.md
index 748ba5014b..e21cc632d8 100644
--- a/examples/provisioning/wifi_prov_mgr/README.md
+++ b/examples/provisioning/wifi_prov_mgr/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # Wi-Fi Provisioning Manager Example
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
diff --git a/examples/storage/sd_card/sdspi/README.md b/examples/storage/sd_card/sdspi/README.md
index bfa49dc053..a23f1401fb 100644
--- a/examples/storage/sd_card/sdspi/README.md
+++ b/examples/storage/sd_card/sdspi/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # SD Card example (SDSPI)
 
 (See the README.md file in the upper level 'examples' directory for more information about examples.)
@@ -118,4 +121,4 @@ An attempt to download a new firmware under this conditions may also result in t
 to clean your board's flash, then download your firmware properly.
 
 
-  
\ No newline at end of file
+  
diff --git a/examples/system/ota/advanced_https_ota/README.md b/examples/system/ota/advanced_https_ota/README.md
index 749016e895..46613dcbf9 100644
--- a/examples/system/ota/advanced_https_ota/README.md
+++ b/examples/system/ota/advanced_https_ota/README.md
@@ -1,3 +1,6 @@
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 |
+| ----------------- | ----- | -------- | -------- |
+
 # Advanced HTTPS OTA example
 
 This example is based on `esp_https_ota` component's APIs.