diff --git a/examples/storage/.build-test-rules.yml b/examples/storage/.build-test-rules.yml
index 701a5601b1..5bc57c03f3 100644
--- a/examples/storage/.build-test-rules.yml
+++ b/examples/storage/.build-test-rules.yml
@@ -1,10 +1,6 @@
 # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps
 
 examples/storage/custom_flash_driver:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
 
 examples/storage/emmc:
   enable:
@@ -13,103 +9,48 @@ examples/storage/emmc:
 
 examples/storage/ext_flash_fatfs:
   disable:
-    - if: IDF_TARGET in ["esp32c2", "esp32c6", "esp32h2", "esp32p4"]
-      temporary: true
-      reason: target(s) not supported yet
+    - if: IDF_TARGET == "esp32p4"
+      reason: not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3"]
+    - if: IDF_TARGET not in ["esp32", "esp32s2"]
       temporary: true
       reason: lack of runners
 
 examples/storage/fatfsgen:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
+    - if: IDF_TARGET != "esp32"
+      reason: only one target needed
 
 examples/storage/nvs_rw_blob:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
-  disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
 
 examples/storage/nvs_rw_value:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
-  disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
 
 examples/storage/nvs_rw_value_cxx:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
-  disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
 
 examples/storage/nvsgen:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners, should be same for every target
+    - if: IDF_TARGET != "esp32"
+      reason: only one target needed
 
 examples/storage/partition_api/partition_find:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
+    - if: IDF_TARGET not in ["esp32", "esp32c3"]
+      reason: only one target per arch needed
 
 examples/storage/partition_api/partition_mmap:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
+    - if: IDF_TARGET not in ["esp32", "esp32c3"]
+      reason: only one target per arch needed
 
 examples/storage/partition_api/partition_ops:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
+    - if: IDF_TARGET not in ["esp32", "esp32c3"]
+      reason: only one target per arch needed
 
 examples/storage/parttool:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
+    - if: IDF_TARGET != "esp32"
+      reason: only one target needed
 
 examples/storage/perf_benchmark:
   disable:
@@ -125,7 +66,7 @@ examples/storage/sd_card/sdmmc:
   disable:
     - if: SOC_SDMMC_HOST_SUPPORTED != 1
   disable_test:
-    - if: IDF_TARGET == "esp32s3"
+    - if: IDF_TARGET not in ["esp32"]
       temporary: true
       reason: lack of runners
 
@@ -133,46 +74,21 @@ examples/storage/sd_card/sdspi:
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
   disable_test:
-    - if: IDF_TARGET in ["esp32s3", "esp32c2", "esp32c6", "esp32h2", "esp32p4"]
+    - if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s2"]
       temporary: true
       reason: lack of runners
 
 examples/storage/semihost_vfs:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32c3", "esp32s2", "esp32s3", "esp32c6", "esp32h2"]
+    - if: IDF_TARGET not in ["esp32"]
       temporary: true
       reason: lack of runners
 
 examples/storage/spiffs:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
-  disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
 
 examples/storage/spiffsgen:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
   disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
+    - if: IDF_TARGET != "esp32"
+      reason: only one target needed
 
 examples/storage/wear_levelling:
-  disable:
-    - if: IDF_TARGET == "esp32c2"
-      temporary: true
-      reason: target esp32c2 is not supported yet
-  disable_test:
-    - if: IDF_TARGET in ["esp32s2", "esp32s3", "esp32c6", "esp32h2"]
-      temporary: true
-      reason: lack of runners
diff --git a/examples/storage/custom_flash_driver/README.md b/examples/storage/custom_flash_driver/README.md
index c124504499..9c251e68cc 100644
--- a/examples/storage/custom_flash_driver/README.md
+++ b/examples/storage/custom_flash_driver/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Custom Flash Driver Example
 
diff --git a/examples/storage/ext_flash_fatfs/README.md b/examples/storage/ext_flash_fatfs/README.md
index 6db77cb420..55538e2e4d 100644
--- a/examples/storage/ext_flash_fatfs/README.md
+++ b/examples/storage/ext_flash_fatfs/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # FAT FS on External Flash example
 
diff --git a/examples/storage/ext_flash_fatfs/pytest_ext_flash_fatfs.py b/examples/storage/ext_flash_fatfs/pytest_ext_flash_fatfs.py
index 8b85b85d2d..b3dfd1e5b9 100644
--- a/examples/storage/ext_flash_fatfs/pytest_ext_flash_fatfs.py
+++ b/examples/storage/ext_flash_fatfs/pytest_ext_flash_fatfs.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 
@@ -7,6 +7,7 @@ from pytest_embedded import Dut
 
 
 @pytest.mark.esp32
+@pytest.mark.esp32s2
 @pytest.mark.external_flash
 def test_ext_flash_fatfs(dut: Dut) -> None:
     message_list = ('Initialized external Flash',
diff --git a/examples/storage/fatfsgen/README.md b/examples/storage/fatfsgen/README.md
index 1beb6fd676..683d59534f 100644
--- a/examples/storage/fatfsgen/README.md
+++ b/examples/storage/fatfsgen/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # FATFS partition generation example
 
diff --git a/examples/storage/fatfsgen/pytest_fatfsgen_example.py b/examples/storage/fatfsgen/pytest_fatfsgen_example.py
index c19201c5a3..74ed3d8051 100644
--- a/examples/storage/fatfsgen/pytest_fatfsgen_example.py
+++ b/examples/storage/fatfsgen/pytest_fatfsgen_example.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import os
diff --git a/examples/storage/nvs_rw_blob/README.md b/examples/storage/nvs_rw_blob/README.md
index e9e2f52b8a..7563617da8 100644
--- a/examples/storage/nvs_rw_blob/README.md
+++ b/examples/storage/nvs_rw_blob/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Non-Volatile Storage (NVS) Read and Write Example
 
diff --git a/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py b/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py
index 23430e76d1..422dee3bb0 100644
--- a/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py
+++ b/examples/storage/nvs_rw_blob/pytest_nvs_rw_blob.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import logging
@@ -11,8 +11,7 @@ import pytest
 from pytest_embedded import Dut
 
 
-@pytest.mark.esp32
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 def test_examples_nvs_rw_blob(dut: Dut) -> None:
     def expect_start_msg(index: int) -> None:
         dut.expect('Restart counter = {}'.format(index), timeout=10)
diff --git a/examples/storage/nvs_rw_value/README.md b/examples/storage/nvs_rw_value/README.md
index ca311bb26e..dd67cc5f5e 100644
--- a/examples/storage/nvs_rw_value/README.md
+++ b/examples/storage/nvs_rw_value/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Non-Volatile Storage (NVS) Read and Write Example
 
diff --git a/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py b/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py
index f42756d6f4..e7f2f30c2a 100644
--- a/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py
+++ b/examples/storage/nvs_rw_value/pytest_nvs_rw_value.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import logging
@@ -8,8 +8,7 @@ import pytest
 from pytest_embedded import Dut
 
 
-@pytest.mark.esp32
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 def test_examples_nvs_rw_value(dut: Dut) -> None:
     for i, counter_state in zip_longest(range(4), ('The value is not initialized yet!',), fillvalue='Done'):
         dut.expect('Opening Non-Volatile Storage \\(NVS\\) handle... Done', timeout=20)
diff --git a/examples/storage/nvs_rw_value_cxx/README.md b/examples/storage/nvs_rw_value_cxx/README.md
index 7108fef8bd..5d9248d662 100644
--- a/examples/storage/nvs_rw_value_cxx/README.md
+++ b/examples/storage/nvs_rw_value_cxx/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Non-Volatile Storage (NVS) C++ Read and Write Example
 
diff --git a/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py b/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py
index 86cf0105fa..e2f990e8e8 100644
--- a/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py
+++ b/examples/storage/nvs_rw_value_cxx/pytest_nvs_rw_value_cxx.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import logging
@@ -8,8 +8,7 @@ import pytest
 from pytest_embedded import Dut
 
 
-@pytest.mark.esp32
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 def test_examples_nvs_rw_value_cxx(dut: Dut) -> None:
     for i, counter_state in zip_longest(range(4), ('The value is not initialized yet!',), fillvalue='Done'):
         dut.expect('Opening Non-Volatile Storage \\(NVS\\) handle... Done', timeout=20)
diff --git a/examples/storage/nvsgen/README.md b/examples/storage/nvsgen/README.md
index 622573a4d0..e0f68366c0 100644
--- a/examples/storage/nvsgen/README.md
+++ b/examples/storage/nvsgen/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # NVS Partition Image Generation on Build Example
 
diff --git a/examples/storage/partition_api/partition_find/README.md b/examples/storage/partition_api/partition_find/README.md
index 823f05a944..50b471279f 100644
--- a/examples/storage/partition_api/partition_find/README.md
+++ b/examples/storage/partition_api/partition_find/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Finding Partitions Example
 
diff --git a/examples/storage/partition_api/partition_find/pytest_partition_find_example.py b/examples/storage/partition_api/partition_find/pytest_partition_find_example.py
index 1bd7d5a22a..6b03f8174c 100644
--- a/examples/storage/partition_api/partition_find/pytest_partition_find_example.py
+++ b/examples/storage/partition_api/partition_find/pytest_partition_find_example.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import re
diff --git a/examples/storage/partition_api/partition_mmap/README.md b/examples/storage/partition_api/partition_mmap/README.md
index 94ea4430d3..d63e67af9c 100644
--- a/examples/storage/partition_api/partition_mmap/README.md
+++ b/examples/storage/partition_api/partition_mmap/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Partition Memory Map Example
 
diff --git a/examples/storage/partition_api/partition_mmap/pytest_partition_mmap_example.py b/examples/storage/partition_api/partition_mmap/pytest_partition_mmap_example.py
index e77d29fe5b..46d306fc77 100644
--- a/examples/storage/partition_api/partition_mmap/pytest_partition_mmap_example.py
+++ b/examples/storage/partition_api/partition_mmap/pytest_partition_mmap_example.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import re
diff --git a/examples/storage/partition_api/partition_ops/README.md b/examples/storage/partition_api/partition_ops/README.md
index 8ff19ce942..0ca9e6dce5 100644
--- a/examples/storage/partition_api/partition_ops/README.md
+++ b/examples/storage/partition_api/partition_ops/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Partition Read, Write, Erase Example
 
diff --git a/examples/storage/partition_api/partition_ops/pytest_partition_ops_example.py b/examples/storage/partition_api/partition_ops/pytest_partition_ops_example.py
index c5f031a703..74abd28608 100644
--- a/examples/storage/partition_api/partition_ops/pytest_partition_ops_example.py
+++ b/examples/storage/partition_api/partition_ops/pytest_partition_ops_example.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import re
diff --git a/examples/storage/parttool/README.md b/examples/storage/parttool/README.md
index a26adf289d..e369b66c21 100644
--- a/examples/storage/parttool/README.md
+++ b/examples/storage/parttool/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Partitions Tool Example
 
diff --git a/examples/storage/parttool/pytest_parttool_example.py b/examples/storage/parttool/pytest_parttool_example.py
index 9f984cfc1a..8411418ab5 100644
--- a/examples/storage/parttool/pytest_parttool_example.py
+++ b/examples/storage/parttool/pytest_parttool_example.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import os
@@ -10,7 +10,6 @@ from pytest_embedded import Dut
 
 
 @pytest.mark.esp32
-@pytest.mark.esp32c3
 def test_examples_parttool(dut: Dut) -> None:
     # Verify factory firmware
     dut.expect('Partitions Tool Example')
diff --git a/examples/storage/perf_benchmark/pytest_perf_benchmark_example.py b/examples/storage/perf_benchmark/pytest_perf_benchmark_example.py
index 34758fbe96..6275e231f6 100644
--- a/examples/storage/perf_benchmark/pytest_perf_benchmark_example.py
+++ b/examples/storage/perf_benchmark/pytest_perf_benchmark_example.py
@@ -52,8 +52,8 @@ def test_examples_perf_benchmark_sdcard_sdmmc(dut: Dut) -> None:
 
 
 @pytest.mark.esp32
-@pytest.mark.esp32s2
 @pytest.mark.esp32c3
+@pytest.mark.esp32s2
 @pytest.mark.sdcard_spimode
 @pytest.mark.parametrize(
     'config',
diff --git a/examples/storage/semihost_vfs/README.md b/examples/storage/semihost_vfs/README.md
index ae14f9a1c2..5a744c2cdd 100644
--- a/examples/storage/semihost_vfs/README.md
+++ b/examples/storage/semihost_vfs/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Semihosting VFS driver example
 
diff --git a/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c b/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c
index 3db7d566b0..05a61e3f4b 100644
--- a/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c
+++ b/examples/storage/semihost_vfs/main/semihost_vfs_example_main.c
@@ -14,6 +14,7 @@
 #include <fcntl.h>
 #include "esp_err.h"
 #include "esp_log.h"
+#include "esp_cpu.h"
 #include "esp_vfs_semihost.h"
 
 static const char *TAG = "example";
diff --git a/examples/storage/semihost_vfs/pytest_semihost_vfs.py b/examples/storage/semihost_vfs/pytest_semihost_vfs.py
index ba5e5478d9..9345086b70 100644
--- a/examples/storage/semihost_vfs/pytest_semihost_vfs.py
+++ b/examples/storage/semihost_vfs/pytest_semihost_vfs.py
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Unlicense OR CC0-1.0
 
 import os
@@ -24,7 +24,6 @@ def prepare() -> t.Generator[None, None, None]:
     shutil.rmtree(TEMP_DIR, ignore_errors=True)
 
 
-@pytest.mark.esp32
 @pytest.mark.jtag
 @pytest.mark.parametrize(
     'embedded_services, no_gdb, openocd_cli_args',
@@ -35,6 +34,30 @@ def prepare() -> t.Generator[None, None, None]:
             f'-c \'set ESP_SEMIHOST_BASEDIR "{TEMP_DIR}"\' -f board/esp32-wrover-kit-3.3v.cfg',
             marks=[pytest.mark.esp32],
         ),
+        # pytest.param(
+        #     'esp,idf,jtag',
+        #     'y',
+        #     f'-c \'set ESP_SEMIHOST_BASEDIR "{TEMP_DIR}"\' -f board/esp32c2-ftdi.cfg',
+        #     marks=[pytest.mark.esp32c2],
+        # ),
+        # pytest.param(
+        #     'esp,idf,jtag',
+        #     'y',
+        #     f'-c \'set ESP_SEMIHOST_BASEDIR "{TEMP_DIR}"\' -f board/esp32s2-kaluga-1.cfg',
+        #     marks=[pytest.mark.esp32c3],
+        # ),
+        # pytest.param(
+        #     'esp,idf,jtag',
+        #     'y',
+        #     f'-c \'set ESP_SEMIHOST_BASEDIR "{TEMP_DIR}"\' -f board/esp32s2-kaluga-1.cfg',
+        #     marks=[pytest.mark.esp32s2],
+        # ),
+        # pytest.param(
+        #     'esp,idf,jtag',
+        #     'y',
+        #     f'-c \'set ESP_SEMIHOST_BASEDIR "{TEMP_DIR}"\' -f board/esp32s2-kaluga-1.cfg',
+        #     marks=[pytest.mark.esp32s3],
+        # ),
     ],
     indirect=True,
 )
diff --git a/examples/storage/spiffs/README.md b/examples/storage/spiffs/README.md
index eaa6959f48..23508289c2 100644
--- a/examples/storage/spiffs/README.md
+++ b/examples/storage/spiffs/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # SPIFFS example
 
diff --git a/examples/storage/spiffs/pytest_spiffs_example.py b/examples/storage/spiffs/pytest_spiffs_example.py
index 70e1540ecd..0687ffe82f 100644
--- a/examples/storage/spiffs/pytest_spiffs_example.py
+++ b/examples/storage/spiffs/pytest_spiffs_example.py
@@ -7,8 +7,7 @@ import pytest
 from pytest_embedded import Dut
 
 
-@pytest.mark.esp32
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 def test_examples_spiffs(dut: Dut) -> None:
     message_list = (rb'example: Initializing SPIFFS',
                     rb'example: Partition size: total: \d+, used: \d+',
diff --git a/examples/storage/spiffsgen/README.md b/examples/storage/spiffsgen/README.md
index 8ec3c47be7..eecc6230dc 100644
--- a/examples/storage/spiffsgen/README.md
+++ b/examples/storage/spiffsgen/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # SPIFFS Image Generation on Build Example
 
diff --git a/examples/storage/spiffsgen/pytest_spiffsgen_example.py b/examples/storage/spiffsgen/pytest_spiffsgen_example.py
index a4c9a7976f..75f2a9ad31 100644
--- a/examples/storage/spiffsgen/pytest_spiffsgen_example.py
+++ b/examples/storage/spiffsgen/pytest_spiffsgen_example.py
@@ -9,7 +9,6 @@ from pytest_embedded import Dut
 
 
 @pytest.mark.esp32
-@pytest.mark.esp32c3
 def test_spiffsgen_example(dut: Dut) -> None:
     # Test with default build configurations
     base_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'spiffs_image')
diff --git a/examples/storage/wear_levelling/README.md b/examples/storage/wear_levelling/README.md
index 8f12b1a493..3fbc2db4c6 100644
--- a/examples/storage/wear_levelling/README.md
+++ b/examples/storage/wear_levelling/README.md
@@ -1,5 +1,5 @@
-| Supported Targets | ESP32 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
-| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- |
+| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
+| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
 
 # Wear levelling example
 
diff --git a/examples/storage/wear_levelling/pytest_wear_levelling_example.py b/examples/storage/wear_levelling/pytest_wear_levelling_example.py
index 51ef1670ac..c55352e02a 100644
--- a/examples/storage/wear_levelling/pytest_wear_levelling_example.py
+++ b/examples/storage/wear_levelling/pytest_wear_levelling_example.py
@@ -8,8 +8,7 @@ import pytest
 from pytest_embedded import Dut
 
 
-@pytest.mark.esp32
-@pytest.mark.esp32c3
+@pytest.mark.supported_targets
 def test_wear_levelling_example(dut: Dut) -> None:
 
     message_list = ('example: Mounting FAT filesystem',