diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d07ef88044d..38ee4dfa62c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -72,9 +72,9 @@
 /libraries/Wire/ @me-no-dev
 /libraries/Zigbee/ @P-R-O-C-H-Y
 
-# CI JSON
+# CI YAML
 # Keep this after other libraries and tests to avoid being overridden.
-**/ci.json @lucasssvaz
+**/ci.yml @lucasssvaz
 
 # The CODEOWNERS file should be owned by the developers of the ESP32 Arduino Core.
 # Leave this entry as the last one to avoid being overridden.
diff --git a/.github/scripts/generate_missing_junits.py b/.github/scripts/generate_missing_junits.py
new file mode 100644
index 00000000000..1a2925ead04
--- /dev/null
+++ b/.github/scripts/generate_missing_junits.py
@@ -0,0 +1,330 @@
+#!/usr/bin/env python3
+
+import json
+import logging
+import os
+import re
+import sys
+from pathlib import Path
+from xml.etree.ElementTree import Element, SubElement, ElementTree
+import yaml
+
+# Configure logging
+logging.basicConfig(level=logging.DEBUG, format='[%(levelname)s] %(message)s', stream=sys.stderr)
+
+
+def parse_array(value) -> list[str]:
+    if isinstance(value, list):
+        return [str(x) for x in value]
+    if not isinstance(value, str):
+        return []
+    txt = value.strip()
+    if not txt:
+        return []
+    # Try JSON
+    try:
+        return [str(x) for x in json.loads(txt)]
+    except Exception as e:
+        logging.debug(f"Failed to parse value as JSON: {e}")
+    # Normalize single quotes then JSON
+    try:
+        fixed = txt.replace("'", '"')
+        return [str(x) for x in json.loads(fixed)]
+    except Exception as e:
+        logging.debug(f"Failed to parse value as JSON with quote normalization: {e}")
+    # Fallback: CSV
+    logging.debug(f"Falling back to CSV parsing for value: {txt}")
+    return [p.strip() for p in txt.strip("[]").split(",") if p.strip()]
+
+
+def _parse_ci_yml(content: str) -> dict:
+    if not content:
+        return {}
+    try:
+        data = yaml.safe_load(content) or {}
+        if not isinstance(data, dict):
+            logging.warning("YAML content is not a dictionary, returning empty dict")
+            return {}
+        return data
+    except Exception as e:
+        logging.error(f"Failed to parse ci.yml content: {e}")
+        return {}
+
+
+def _fqbn_counts_from_yaml(ci: dict) -> dict[str, int]:
+    counts: dict[str, int] = {}
+    if not isinstance(ci, dict):
+        return counts
+    fqbn = ci.get("fqbn")
+    if not isinstance(fqbn, dict):
+        return counts
+    for target, entries in fqbn.items():
+        if isinstance(entries, list):
+            counts[str(target)] = len(entries)
+        elif entries is not None:
+            # Single value provided as string
+            counts[str(target)] = 1
+    return counts
+
+
+def _sdkconfig_meets(ci_cfg: dict, sdk_text: str) -> bool:
+    if not sdk_text:
+        return True
+    for req in ci_cfg.get("requires", []):
+        if not req or not isinstance(req, str):
+            continue
+        if not any(line.startswith(req) for line in sdk_text.splitlines()):
+            return False
+    req_any = ci_cfg.get("requires_any", [])
+    if req_any:
+        if not any(any(line.startswith(r.strip()) for line in sdk_text.splitlines()) for r in req_any if isinstance(r, str)):
+            return False
+    return True
+
+
+def expected_from_artifacts(build_root: Path) -> dict[tuple[str, str, str, str], int]:
+    """Compute expected runs using ci.yml and sdkconfig found in build artifacts.
+    Returns mapping (platform, target, type, sketch) -> expected_count
+    """
+    expected: dict[tuple[str, str, str, str], int] = {}
+    if not build_root.exists():
+        return expected
+    print(f"[DEBUG] Scanning build artifacts in: {build_root}", file=sys.stderr)
+    for artifact_dir in build_root.iterdir():
+        if not artifact_dir.is_dir():
+            continue
+        m = re.match(r"test-bin-([A-Za-z0-9_\-]+)-([A-Za-z0-9_\-]+)", artifact_dir.name)
+        if not m:
+            continue
+        target = m.group(1)
+        test_type = m.group(2)
+        print(f"[DEBUG] Artifact group target={target} type={test_type} dir={artifact_dir}", file=sys.stderr)
+
+        # Group build*.tmp directories by sketch
+        # Structure: test-bin-<target>-<type>/<sketch>/build*.tmp/
+        sketches_processed = set()
+
+        # Find all build*.tmp directories and process each sketch once
+        for build_tmp in artifact_dir.rglob("build*.tmp"):
+            if not build_tmp.is_dir():
+                continue
+            if not re.search(r"build\d*\.tmp$", build_tmp.name):
+                continue
+
+            # Path structure is: test-bin-<target>-<type>/<sketch>/build*.tmp/
+            sketch = build_tmp.parent.name
+
+            # Skip if we already processed this sketch
+            if sketch in sketches_processed:
+                continue
+            sketches_processed.add(sketch)
+
+            print(f"[DEBUG]  Processing sketch={sketch} from artifact {artifact_dir.name}", file=sys.stderr)
+
+            ci_path = build_tmp / "ci.yml"
+            sdk_path = build_tmp / "sdkconfig"
+
+            # Read ci.yml if it exists, otherwise use empty (defaults)
+            ci_text = ""
+            if ci_path.exists():
+                try:
+                    ci_text = ci_path.read_text(encoding="utf-8")
+                except Exception as e:
+                    logging.warning(f"Failed to read ci.yml from {ci_path}: {e}")
+            else:
+                logging.debug(f"No ci.yml found at {ci_path}, using defaults")
+
+            try:
+                sdk_text = sdk_path.read_text(encoding="utf-8", errors="ignore") if sdk_path.exists() else ""
+            except Exception as e:
+                logging.warning(f"Failed to read sdkconfig from {sdk_path}: {e}")
+                sdk_text = ""
+
+            ci = _parse_ci_yml(ci_text)
+            fqbn_counts = _fqbn_counts_from_yaml(ci)
+
+            # Determine allowed platforms for this test
+            # Performance tests are only run on hardware
+            if test_type == "performance":
+                allowed_platforms = ["hardware"]
+            else:
+                allowed_platforms = []
+                platforms_cfg = ci.get("platforms") if isinstance(ci, dict) else None
+                for plat in ("hardware", "wokwi", "qemu"):
+                    dis = None
+                    if isinstance(platforms_cfg, dict):
+                        dis = platforms_cfg.get(plat)
+                    if dis is False:
+                        continue
+                    allowed_platforms.append(plat)
+
+            # Requirements check
+            minimal = {
+                "requires": ci.get("requires") or [],
+                "requires_any": ci.get("requires_any") or [],
+            }
+            if not _sdkconfig_meets(minimal, sdk_text):
+                print(f"[DEBUG]   Skip (requirements not met): target={target} type={test_type} sketch={sketch}", file=sys.stderr)
+                continue
+
+            # Expected runs = number from fqbn_counts in ci.yml (how many FQBNs for this target)
+            exp_runs = fqbn_counts.get(target, 0) or 1
+            print(f"[DEBUG]   ci.yml specifies {exp_runs} FQBN(s) for target={target}", file=sys.stderr)
+
+            for plat in allowed_platforms:
+                expected[(plat, target, test_type, sketch)] = exp_runs
+                print(f"[DEBUG]   Expected: plat={plat} target={target} type={test_type} sketch={sketch} runs={exp_runs}", file=sys.stderr)
+
+        if len(sketches_processed) == 0:
+            print(f"[DEBUG]  No sketches found in this artifact group", file=sys.stderr)
+    return expected
+
+
+def scan_executed_xml(xml_root: Path, valid_types: set[str]) -> dict[tuple[str, str, str, str], int]:
+    """Return executed counts per (platform, target, type, sketch).
+    Type/sketch/target are inferred from .../<type>/<sketch>/<target>/<file>.xml
+    """
+    counts: dict[tuple[str, str, str, str], int] = {}
+    if not xml_root.exists():
+        print(f"[DEBUG] Results root not found: {xml_root}", file=sys.stderr)
+        return counts
+    print(f"[DEBUG] Scanning executed XMLs in: {xml_root}", file=sys.stderr)
+    for xml_path in xml_root.rglob("*.xml"):
+        if not xml_path.is_file():
+            continue
+        rel = str(xml_path)
+        platform = "hardware"
+        if "test-results-wokwi-" in rel:
+            platform = "wokwi"
+        elif "test-results-qemu-" in rel:
+            platform = "qemu"
+        # Expect .../<type>/<sketch>/<target>/*.xml
+        parts = xml_path.parts
+        t_idx = -1
+        for i, p in enumerate(parts):
+            if p in valid_types:
+                t_idx = i
+        if t_idx == -1 or t_idx + 3 >= len(parts):
+            continue
+        test_type = parts[t_idx]
+        sketch = parts[t_idx + 1]
+        target = parts[t_idx + 2]
+        key = (platform, target, test_type, sketch)
+        old_count = counts.get(key, 0)
+        counts[key] = old_count + 1
+        print(f"[DEBUG]  Executed XML #{old_count + 1}: plat={platform} target={target} type={test_type} sketch={sketch} file={xml_path.name}", file=sys.stderr)
+    print(f"[DEBUG] Executed entries discovered: {len(counts)}", file=sys.stderr)
+    return counts
+
+
+def write_missing_xml(out_root: Path, platform: str, target: str, test_type: str, sketch: str, missing_count: int):
+    out_tests_dir = out_root / f"test-results-{platform}" / "tests" / test_type / sketch / target
+    out_tests_dir.mkdir(parents=True, exist_ok=True)
+    # Create one XML per missing index
+    for idx in range(missing_count):
+        suite_name = f"{test_type}_{platform}_{target}_{sketch}"
+        root = Element("testsuite", name=suite_name, tests="1", failures="0", errors="1")
+        case = SubElement(root, "testcase", classname=f"{test_type}.{sketch}", name="missing-run")
+        error = SubElement(case, "error", message="Expected test run missing")
+        error.text = "This placeholder indicates an expected test run did not execute."
+        tree = ElementTree(root)
+        out_file = out_tests_dir / f"{sketch}_missing_{idx}.xml"
+        tree.write(out_file, encoding="utf-8", xml_declaration=True)
+
+
+def main():
+    # Args: <build_artifacts_dir> <test_results_dir> <output_junit_dir>
+    if len(sys.argv) != 4:
+        print(f"Usage: {sys.argv[0]} <build_artifacts_dir> <test_results_dir> <output_junit_dir>", file=sys.stderr)
+        return 2
+
+    build_root = Path(sys.argv[1]).resolve()
+    results_root = Path(sys.argv[2]).resolve()
+    out_root = Path(sys.argv[3]).resolve()
+
+    # Validate inputs
+    if not build_root.is_dir():
+        print(f"ERROR: Build artifacts directory not found: {build_root}", file=sys.stderr)
+        return 2
+    if not results_root.is_dir():
+        print(f"ERROR: Test results directory not found: {results_root}", file=sys.stderr)
+        return 2
+    # Ensure output directory exists
+    try:
+        out_root.mkdir(parents=True, exist_ok=True)
+    except Exception as e:
+        print(f"ERROR: Failed to create output directory {out_root}: {e}", file=sys.stderr)
+        return 2
+
+    # Read matrices from environment variables injected by workflow
+    hw_enabled = (os.environ.get("HW_TESTS_ENABLED", "false").lower() == "true")
+    wokwi_enabled = (os.environ.get("WOKWI_TESTS_ENABLED", "false").lower() == "true")
+    qemu_enabled = (os.environ.get("QEMU_TESTS_ENABLED", "false").lower() == "true")
+
+    hw_targets = parse_array(os.environ.get("HW_TARGETS", "[]"))
+    wokwi_targets = parse_array(os.environ.get("WOKWI_TARGETS", "[]"))
+    qemu_targets = parse_array(os.environ.get("QEMU_TARGETS", "[]"))
+
+    hw_types = parse_array(os.environ.get("HW_TYPES", "[]"))
+    wokwi_types = parse_array(os.environ.get("WOKWI_TYPES", "[]"))
+    qemu_types = parse_array(os.environ.get("QEMU_TYPES", "[]"))
+
+    expected = expected_from_artifacts(build_root)  # (platform, target, type, sketch) -> expected_count
+    executed_types = set(hw_types + wokwi_types + qemu_types)
+    executed = scan_executed_xml(results_root, executed_types)      # (platform, target, type, sketch) -> count
+    print(f"[DEBUG] Expected entries computed: {len(expected)}", file=sys.stderr)
+
+    # Filter expected by enabled platforms and target/type matrices
+    enabled_plats = set()
+    if hw_enabled:
+        enabled_plats.add("hardware")
+    if wokwi_enabled:
+        enabled_plats.add("wokwi")
+    if qemu_enabled:
+        enabled_plats.add("qemu")
+
+    # Build platform-specific target and type sets
+    plat_targets = {
+        "hardware": set(hw_targets),
+        "wokwi": set(wokwi_targets),
+        "qemu": set(qemu_targets),
+    }
+    plat_types = {
+        "hardware": set(hw_types),
+        "wokwi": set(wokwi_types),
+        "qemu": set(qemu_types),
+    }
+
+    missing_total = 0
+    extra_total = 0
+    for (plat, target, test_type, sketch), exp_count in expected.items():
+        if plat not in enabled_plats:
+            continue
+        # Check if target and type are valid for this specific platform
+        if target not in plat_targets.get(plat, set()):
+            continue
+        if test_type not in plat_types.get(plat, set()):
+            continue
+        got = executed.get((plat, target, test_type, sketch), 0)
+        if got < exp_count:
+            print(f"[DEBUG] Missing: plat={plat} target={target} type={test_type} sketch={sketch} expected={exp_count} got={got}", file=sys.stderr)
+            write_missing_xml(out_root, plat, target, test_type, sketch, exp_count - got)
+            missing_total += (exp_count - got)
+        elif got > exp_count:
+            print(f"[DEBUG] Extra runs: plat={plat} target={target} type={test_type} sketch={sketch} expected={exp_count} got={got}", file=sys.stderr)
+            extra_total += (got - exp_count)
+
+    # Check for executed tests that were not expected at all
+    for (plat, target, test_type, sketch), got in executed.items():
+        if (plat, target, test_type, sketch) not in expected:
+            print(f"[DEBUG] Unexpected test: plat={plat} target={target} type={test_type} sketch={sketch} got={got} (not in expected)", file=sys.stderr)
+
+    print(f"Generated {missing_total} placeholder JUnit files for missing runs.", file=sys.stderr)
+    if extra_total > 0:
+        print(f"WARNING: {extra_total} extra test runs detected (more than expected).", file=sys.stderr)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
+
+
diff --git a/.github/scripts/get_affected.py b/.github/scripts/get_affected.py
index 85e35c40e43..66fcd1de2b7 100755
--- a/.github/scripts/get_affected.py
+++ b/.github/scripts/get_affected.py
@@ -63,7 +63,7 @@
 Build file patterns
 --------------------
 - **build_files**: Core Arduino build system files (platform.txt, variants/**, etc.)
-- **sketch_build_files**: Sketch-specific files (ci.json, *.csv in example directories)
+- **sketch_build_files**: Sketch-specific files (ci.yml, *.csv in example directories)
 - **idf_build_files**: Core IDF build system files (CMakeLists.txt, idf_component.yml, etc.)
 - **idf_project_files**: Project-specific IDF files (per-example CMakeLists.txt, sdkconfig, etc.)
 
@@ -128,7 +128,7 @@
 # Files that are used by the sketch build system.
 # If any of these files change, the sketch should be recompiled.
 sketch_build_files = [
-    "libraries/*/examples/**/ci.json",
+    "libraries/*/examples/**/ci.yml",
     "libraries/*/examples/**/*.csv",
 ]
 
@@ -150,7 +150,7 @@
 # If any of these files change, the example that uses them should be recompiled.
 idf_project_files = [
     "idf_component_examples/*/CMakeLists.txt",
-    "idf_component_examples/*/ci.json",
+    "idf_component_examples/*/ci.yml",
     "idf_component_examples/*/*.csv",
     "idf_component_examples/*/sdkconfig*",
     "idf_component_examples/*/main/*",
diff --git a/.github/scripts/on-push-idf.sh b/.github/scripts/on-push-idf.sh
index 166bfe13eb1..66a61b2dff6 100644
--- a/.github/scripts/on-push-idf.sh
+++ b/.github/scripts/on-push-idf.sh
@@ -17,9 +17,9 @@ fi
 
 for example in $affected_examples; do
     example_path="$PWD/components/arduino-esp32/$example"
-    if [ -f "$example_path/ci.json" ]; then
+    if [ -f "$example_path/ci.yml" ]; then
         # If the target is listed as false, skip the sketch. Otherwise, include it.
-        is_target=$(jq -r --arg target "$IDF_TARGET" '.targets[$target]' "$example_path/ci.json")
+        is_target=$(yq eval ".targets.${IDF_TARGET}" "$example_path/ci.yml" 2>/dev/null)
         if [[ "$is_target" == "false" ]]; then
             printf "\n\033[93mSkipping %s for target %s\033[0m\n\n" "$example" "$IDF_TARGET"
             continue
diff --git a/.github/scripts/runtime_table_generator.py b/.github/scripts/runtime_table_generator.py
new file mode 100644
index 00000000000..bf6c544f452
--- /dev/null
+++ b/.github/scripts/runtime_table_generator.py
@@ -0,0 +1,181 @@
+import json
+import logging
+import sys
+import os
+import re
+from datetime import datetime
+
+# Configure logging
+logging.basicConfig(level=logging.DEBUG, format='[%(levelname)s] %(message)s', stream=sys.stderr)
+
+SUCCESS_SYMBOL = ":white_check_mark:"
+FAILURE_SYMBOL = ":x:"
+ERROR_SYMBOL = ":fire:"
+
+# Load the JSON file passed as argument to the script
+with open(sys.argv[1], "r") as f:
+    data = json.load(f)
+    tests = sorted(data["stats"]["suite_details"], key=lambda x: x["name"])
+
+# Get commit SHA from command line argument or environment variable
+commit_sha = None
+if len(sys.argv) < 2 or len(sys.argv) > 3:
+    print(f"Usage: python {sys.argv[0]} <test_results.json> [commit_sha]", file=sys.stderr)
+    sys.exit(1)
+elif len(sys.argv) == 3:  # Commit SHA is provided as argument
+    commit_sha = sys.argv[2]
+elif "GITHUB_SHA" in os.environ:  # Commit SHA is provided as environment variable
+    commit_sha = os.environ["GITHUB_SHA"]
+else:  # Commit SHA is not provided
+    print("Commit SHA is not provided. Please provide it as an argument or set the GITHUB_SHA environment variable.", file=sys.stderr)
+    sys.exit(1)
+
+# Generate the table
+
+print("## Runtime Test Results")
+print("")
+
+try:
+    if os.environ["IS_FAILING"] == "true":
+        print(f"{FAILURE_SYMBOL} **The test workflows are failing. Please check the run logs.** {FAILURE_SYMBOL}")
+        print("")
+    else:
+        print(f"{SUCCESS_SYMBOL} **The test workflows are passing.** {SUCCESS_SYMBOL}")
+        print("")
+except KeyError as e:
+    logging.debug(f"IS_FAILING environment variable not set: {e}")
+
+print("### Validation Tests")
+
+# Read platform-specific target lists from environment variables
+# Map env var names to test suite platform names: hw->hardware, wokwi->wokwi, qemu->qemu
+platform_targets = {}
+try:
+    hw_targets = json.loads(os.environ.get("HW_TARGETS", "[]"))
+    wokwi_targets = json.loads(os.environ.get("WOKWI_TARGETS", "[]"))
+    qemu_targets = json.loads(os.environ.get("QEMU_TARGETS", "[]"))
+
+    platform_targets["hardware"] = sorted(hw_targets) if hw_targets else []
+    platform_targets["wokwi"] = sorted(wokwi_targets) if wokwi_targets else []
+    platform_targets["qemu"] = sorted(qemu_targets) if qemu_targets else []
+except (json.JSONDecodeError, KeyError) as e:
+    print(f"Warning: Could not parse platform targets from environment: {e}", file=sys.stderr)
+    platform_targets = {"hardware": [], "wokwi": [], "qemu": []}
+
+proc_test_data = {}
+
+# Build executed tests map and collect targets
+executed_tests_index = {}  # {(platform, target, test_name): {tests, failures, errors}}
+executed_run_counts = {}   # {(platform, target, test_name): int}
+
+for test in tests:
+    if test["name"].startswith("performance_"):
+        continue
+
+    try:
+        test_type, platform, target, rest = test["name"].split("_", 3)
+    except ValueError as e:
+        # Unexpected name, skip
+        test_name = test.get("name", "unknown")
+        logging.warning(f"Skipping test with unexpected name format '{test_name}': {e}")
+        continue
+
+    # Remove an optional trailing numeric index (multi-FQBN builds)
+    m = re.match(r"(.+?)(\d+)?$", rest)
+    test_name = m.group(1) if m else rest
+
+    if platform not in proc_test_data:
+        proc_test_data[platform] = {}
+
+    if test_name not in proc_test_data[platform]:
+        proc_test_data[platform][test_name] = {}
+
+    if target not in proc_test_data[platform][test_name]:
+        proc_test_data[platform][test_name][target] = {
+            "failures": 0,
+            "total": 0,
+            "errors": 0
+        }
+
+    proc_test_data[platform][test_name][target]["total"] += test["tests"]
+    proc_test_data[platform][test_name][target]["failures"] += test["failures"]
+    proc_test_data[platform][test_name][target]["errors"] += test["errors"]
+
+    executed_tests_index[(platform, target, test_name)] = proc_test_data[platform][test_name][target]
+    executed_run_counts[(platform, target, test_name)] = executed_run_counts.get((platform, target, test_name), 0) + 1
+
+# Render only executed tests grouped by platform/target/test
+for platform in proc_test_data:
+    print("")
+    print(f"#### {platform.capitalize()}")
+    print("")
+
+    # Get platform-specific target list
+    target_list = platform_targets.get(platform, [])
+
+    if not target_list:
+        print(f"No targets configured for platform: {platform}")
+        continue
+
+    print("Test", end="")
+
+    for target in target_list:
+        # Make target name uppercase and add hyfen if not esp32
+        display_target = target
+        if target != "esp32":
+            display_target = target.replace("esp32", "esp32-")
+
+        print(f"|{display_target.upper()}", end="")
+
+    print("")
+    print("-" + "|:-:" * len(target_list))
+
+    platform_executed = proc_test_data.get(platform, {})
+    for test_name in sorted(platform_executed.keys()):
+        print(f"{test_name}", end="")
+        for target in target_list:
+            executed_cell = platform_executed.get(test_name, {}).get(target)
+            if executed_cell:
+                if executed_cell["errors"] > 0:
+                    print(f"|Error {ERROR_SYMBOL}", end="")
+                else:
+                    print(f"|{executed_cell['total']-executed_cell['failures']}/{executed_cell['total']}", end="")
+                    if executed_cell["failures"] > 0:
+                        print(f" {FAILURE_SYMBOL}", end="")
+                    else:
+                        print(f" {SUCCESS_SYMBOL}", end="")
+            else:
+                print("|-", end="")
+        print("")
+
+print("\n")
+print(f"Generated on: {datetime.now().strftime('%Y/%m/%d %H:%M:%S')}")
+print("")
+
+try:
+    repo = os.environ['GITHUB_REPOSITORY']
+    commit_url = f"https://github.com/{repo}/commit/{commit_sha}"
+    build_workflow_url = f"https://github.com/{repo}/actions/runs/{os.environ['BUILD_RUN_ID']}"
+    wokwi_hw_workflow_url = f"https://github.com/{repo}/actions/runs/{os.environ['WOKWI_RUN_ID']}"
+    results_workflow_url = f"https://github.com/{repo}/actions/runs/{os.environ['RESULTS_RUN_ID']}"
+    results_url = os.environ['RESULTS_URL']
+    print(f"[Commit]({commit_url}) / [Build and QEMU run]({build_workflow_url}) / [Hardware and Wokwi run]({wokwi_hw_workflow_url}) / [Results processing]({results_workflow_url})")
+    print("")
+    print(f"[Test results]({results_url})")
+except KeyError as e:
+    logging.debug(f"Required environment variable for URL generation not set: {e}")
+
+# Save test results to JSON file
+results_data = {
+    "commit_sha": commit_sha,
+    "tests_failed": os.environ["IS_FAILING"] == "true",
+    "test_data": proc_test_data,
+    "generated_at": datetime.now().isoformat()
+}
+
+with open("test_results.json", "w") as f:
+    json.dump(results_data, f, indent=2)
+
+print(f"\nTest results saved to test_results.json", file=sys.stderr)
+print(f"Commit SHA: {commit_sha}", file=sys.stderr)
+print(f"Tests failed: {results_data['tests_failed']}", file=sys.stderr)
diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 02990ca8914..7452e494084 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -15,13 +15,13 @@ function check_requirements { # check_requirements <sketchdir> <sdkconfig_path>
     local requirements
     local requirements_or
 
-    if [ ! -f "$sdkconfig_path" ] || [ ! -f "$sketchdir/ci.json" ]; then
-        echo "WARNING: sdkconfig or ci.json not found. Assuming requirements are met." 1>&2
+    if [ ! -f "$sdkconfig_path" ] || [ ! -f "$sketchdir/ci.yml" ]; then
+        echo "WARNING: sdkconfig or ci.yml not found. Assuming requirements are met." 1>&2
         # Return 1 on error to force the sketch to be built and fail. This way the
         # CI will fail and the user will know that the sketch has a problem.
     else
         # Check if the sketch requires any configuration options (AND)
-        requirements=$(jq -r '.requires[]? // empty' "$sketchdir/ci.json")
+        requirements=$(yq eval '.requires[]' "$sketchdir/ci.yml" 2>/dev/null)
         if [[ "$requirements" != "null" && "$requirements" != "" ]]; then
             for requirement in $requirements; do
                 requirement=$(echo "$requirement" | xargs)
@@ -33,7 +33,7 @@ function check_requirements { # check_requirements <sketchdir> <sdkconfig_path>
         fi
 
         # Check if the sketch requires any configuration options (OR)
-        requirements_or=$(jq -r '.requires_any[]? // empty' "$sketchdir/ci.json")
+        requirements_or=$(yq eval '.requires_any[]' "$sketchdir/ci.yml" 2>/dev/null)
         if [[ "$requirements_or" != "null" && "$requirements_or" != "" ]]; then
             local found=false
             for requirement in $requirements_or; do
@@ -122,13 +122,13 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
         # precedence.  Note that the following logic also falls to the default
         # parameters if no arguments were passed and no file was found.
 
-        if [ -z "$options" ] && [ -f "$sketchdir"/ci.json ]; then
+        if [ -z "$options" ] && [ -f "$sketchdir"/ci.yml ]; then
             # The config file could contain multiple FQBNs for one chip.  If
             # that's the case we build one time for every FQBN.
 
-            len=$(jq -r --arg target "$target" '.fqbn[$target] | length' "$sketchdir"/ci.json)
+            len=$(yq eval ".fqbn.${target} | length" "$sketchdir"/ci.yml 2>/dev/null || echo 0)
             if [ "$len" -gt 0 ]; then
-                fqbn=$(jq -r --arg target "$target" '.fqbn[$target] | sort' "$sketchdir"/ci.json)
+                fqbn=$(yq eval ".fqbn.${target} | sort | @json" "$sketchdir"/ci.yml)
             fi
         fi
 
@@ -138,8 +138,8 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
 
             len=1
 
-            if [ -f "$sketchdir"/ci.json ]; then
-                fqbn_append=$(jq -r '.fqbn_append' "$sketchdir"/ci.json)
+            if [ -f "$sketchdir"/ci.yml ]; then
+                fqbn_append=$(yq eval '.fqbn_append' "$sketchdir"/ci.yml 2>/dev/null)
                 if [ "$fqbn_append" == "null" ]; then
                     fqbn_append=""
                 fi
@@ -229,9 +229,9 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
     sketchname=$(basename "$sketchdir")
     local has_requirements
 
-    if [ -f "$sketchdir"/ci.json ]; then
+    if [ -f "$sketchdir"/ci.yml ]; then
         # If the target is listed as false, skip the sketch. Otherwise, include it.
-        is_target=$(jq -r --arg target "$target" '.targets[$target]' "$sketchdir"/ci.json)
+        is_target=$(yq eval ".targets.${target}" "$sketchdir"/ci.yml 2>/dev/null)
         if [[ "$is_target" == "false" ]]; then
             echo "Skipping $sketchname for target $target"
             exit 0
@@ -244,7 +244,7 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
         fi
     fi
 
-    # Install libraries from ci.json if they exist
+    # Install libraries from ci.yml if they exist
     install_libs -ai "$ide_path" -s "$sketchdir"
     install_result=$?
     if [ $install_result -ne 0 ]; then
@@ -294,6 +294,11 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
                 exit "$exit_status"
             fi
 
+            # Copy ci.yml alongside compiled binaries for later consumption by reporting tools
+            if [ -f "$sketchdir/ci.yml" ]; then
+                cp -f "$sketchdir/ci.yml" "$build_dir/ci.yml" 2>/dev/null || true
+            fi
+
             if [ -n "$log_compilation" ]; then
                 #Extract the program storage space and dynamic memory usage in bytes and percentage in separate variables from the output, just the value without the string
                 flash_bytes=$(grep -oE 'Sketch uses ([0-9]+) bytes' "$output_file" | awk '{print $3}')
@@ -337,6 +342,10 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
                 echo "ERROR: Compilation failed with error code $exit_status"
                 exit $exit_status
             fi
+            # Copy ci.yml alongside compiled binaries for later consumption by reporting tools
+            if [ -f "$sketchdir/ci.yml" ]; then
+                cp -f "$sketchdir/ci.yml" "$build_dir/ci.yml" 2>/dev/null || true
+            fi
             # $ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
             #     -fqbn=\"$currfqbn\" \
             #     -warnings="all" \
@@ -394,9 +403,9 @@ function count_sketches { # count_sketches <path> [target] [ignore-requirements]
 
         if [[ "$sketchdirname.ino" != "$sketchname" ]]; then
             continue
-        elif [[ -n $target ]] && [[ -f $sketchdir/ci.json ]]; then
+        elif [[ -n $target ]] && [[ -f $sketchdir/ci.yml ]]; then
             # If the target is listed as false, skip the sketch. Otherwise, include it.
-            is_target=$(jq -r --arg target "$target" '.targets[$target]' "$sketchdir"/ci.json)
+            is_target=$(yq eval ".targets.${target}" "$sketchdir"/ci.yml 2>/dev/null)
             if [[ "$is_target" == "false" ]]; then
                 continue
             fi
@@ -637,38 +646,38 @@ function install_libs { # install_libs <ide_path> <sketchdir> [-v]
         return 1
     fi
 
-    if [ ! -f "$sketchdir/ci.json" ]; then
-        [ "$verbose" = true ] && echo "No ci.json found in $sketchdir, skipping library installation"
+    if [ ! -f "$sketchdir/ci.yml" ]; then
+        [ "$verbose" = true ] && echo "No ci.yml found in $sketchdir, skipping library installation"
         return 0
     fi
-    if ! jq -e . "$sketchdir/ci.json" >/dev/null 2>&1; then
-        echo "ERROR: $sketchdir/ci.json is not valid JSON" >&2
+    if ! yq eval '.' "$sketchdir/ci.yml" >/dev/null 2>&1; then
+        echo "ERROR: $sketchdir/ci.yml is not valid YAML" >&2
         return 1
     fi
 
     local libs_type
-    libs_type=$(jq -r '.libs | type' "$sketchdir/ci.json" 2>/dev/null)
-    if [ -z "$libs_type" ] || [ "$libs_type" = "null" ]; then
-        [ "$verbose" = true ] && echo "No libs field found in ci.json, skipping library installation"
+    libs_type=$(yq eval '.libs | type' "$sketchdir/ci.yml" 2>/dev/null)
+    if [ -z "$libs_type" ] || [ "$libs_type" = "null" ] || [ "$libs_type" = "!!null" ]; then
+        [ "$verbose" = true ] && echo "No libs field found in ci.yml, skipping library installation"
         return 0
-    elif [ "$libs_type" != "array" ]; then
-        echo "ERROR: libs field in ci.json must be an array, found: $libs_type" >&2
+    elif [ "$libs_type" != "!!seq" ]; then
+        echo "ERROR: libs field in ci.yml must be an array, found: $libs_type" >&2
         return 1
     fi
 
     local libs_count
-    libs_count=$(jq -r '.libs | length' "$sketchdir/ci.json" 2>/dev/null)
+    libs_count=$(yq eval '.libs | length' "$sketchdir/ci.yml" 2>/dev/null)
     if [ "$libs_count" -eq 0 ]; then
-        [ "$verbose" = true ] && echo "libs array is empty in ci.json, skipping library installation"
+        [ "$verbose" = true ] && echo "libs array is empty in ci.yml, skipping library installation"
         return 0
     fi
 
-    echo "Installing $libs_count libraries from $sketchdir/ci.json"
+    echo "Installing $libs_count libraries from $sketchdir/ci.yml"
 
     local needs_unsafe=false
     local original_unsafe_setting=""
     local libs
-    libs=$(jq -r '.libs[]? // empty' "$sketchdir/ci.json")
+    libs=$(yq eval '.libs[]' "$sketchdir/ci.yml" 2>/dev/null)
 
     # Detect any git-like URL (GitHub/GitLab/Bitbucket/self-hosted/ssh)
     for lib in $libs; do
@@ -749,7 +758,7 @@ Available commands:
     build: Build a sketch.
     chunk_build: Build a chunk of sketches.
     check_requirements: Check if target meets sketch requirements.
-    install_libs: Install libraries from ci.json file.
+    install_libs: Install libraries from ci.yml file.
 "
 
 cmd=$1
diff --git a/.github/scripts/tests_matrix.sh b/.github/scripts/tests_matrix.sh
index 01cc122753c..6b4f8001fc3 100644
--- a/.github/scripts/tests_matrix.sh
+++ b/.github/scripts/tests_matrix.sh
@@ -1,29 +1,49 @@
 #!/bin/bash
 
-build_types="'validation'"
-hw_types="'validation'"
-wokwi_types="'validation'"
-qemu_types="'validation'"
+# QEMU is disabled for now
+qemu_enabled="false"
+
+build_types='"validation"'
+hw_types='"validation"'
+wokwi_types='"validation"'
+qemu_types='"validation"'
 
 if [[ $IS_PR != 'true' ]] || [[ $PERFORMANCE_ENABLED == 'true' ]]; then
-    build_types+=",'performance'"
-    hw_types+=",'performance'"
-    #wokwi_types+=",'performance'"
-    #qemu_types+=",'performance'"
+    build_types+=',"performance"'
+    hw_types+=',"performance"'
+    #wokwi_types+=',"performance"'
+    #qemu_types+=',"performance"'
 fi
 
-targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c6','esp32h2','esp32p4'"
+hw_targets='"esp32","esp32s2","esp32s3","esp32c3","esp32c5","esp32c6","esp32h2","esp32p4"'
+wokwi_targets='"esp32","esp32s2","esp32s3","esp32c3","esp32c6","esp32h2","esp32p4"'
+qemu_targets='"esp32","esp32c3"'
+
+# The build targets should be the sum of the hw, wokwi and qemu targets without duplicates
+build_targets=$(echo "$hw_targets,$wokwi_targets,$qemu_targets" | tr ',' '\n' | sort -u | tr '\n' ',' | sed 's/,$//')
 
 mkdir -p info
 
-echo "[$wokwi_types]" > info/wokwi_types.txt
-echo "[$hw_types]" > info/hw_types.txt
-echo "[$targets]" > info/targets.txt
+# Create a single JSON file with all test matrix information
+cat > info/test_matrix.json <<EOF
+{
+    "performance_enabled": $PERFORMANCE_ENABLED,
+    "qemu_enabled": $qemu_enabled,
+    "build_targets": [$build_targets],
+    "build_types": [$build_types],
+    "hw_targets": [$hw_targets],
+    "hw_types": [$hw_types],
+    "wokwi_targets": [$wokwi_targets],
+    "wokwi_types": [$wokwi_types],
+    "qemu_targets": [$qemu_targets],
+    "qemu_types": [$qemu_types]
+}
+EOF
 
 {
+    echo "build-targets=[$build_targets]"
     echo "build-types=[$build_types]"
-    echo "hw-types=[$hw_types]"
-    echo "wokwi-types=[$wokwi_types]"
+    echo "qemu-enabled=$qemu_enabled"
+    echo "qemu-targets=[$qemu_targets]"
     echo "qemu-types=[$qemu_types]"
-    echo "targets=[$targets]"
 } >> "$GITHUB_OUTPUT"
diff --git a/.github/scripts/tests_run.sh b/.github/scripts/tests_run.sh
index 26ec1a10d43..8dfda3d5154 100755
--- a/.github/scripts/tests_run.sh
+++ b/.github/scripts/tests_run.sh
@@ -17,8 +17,8 @@ function run_test {
     sketchname=$(basename "$sketchdir")
     test_type=$(basename "$(dirname "$sketchdir")")
 
-    if [ "$options" -eq 0 ] && [ -f "$sketchdir"/ci.json ]; then
-        len=$(jq -r --arg target "$target" '.fqbn[$target] | length' "$sketchdir"/ci.json)
+    if [ "$options" -eq 0 ] && [ -f "$sketchdir"/ci.yml ]; then
+        len=$(yq eval ".fqbn.${target} | length" "$sketchdir"/ci.yml 2>/dev/null || echo 0)
         if [ "$len" -eq 0 ]; then
             len=1
         fi
@@ -32,10 +32,10 @@ function run_test {
         sdkconfig_path="$HOME/.arduino/tests/$target/$sketchname/build0.tmp/sdkconfig"
     fi
 
-    if [ -f "$sketchdir"/ci.json ]; then
+    if [ -f "$sketchdir"/ci.yml ]; then
         # If the target or platform is listed as false, skip the sketch. Otherwise, include it.
-        is_target=$(jq -r --arg target "$target" '.targets[$target]' "$sketchdir"/ci.json)
-        selected_platform=$(jq -r --arg platform "$platform" '.platforms[$platform]' "$sketchdir"/ci.json)
+        is_target=$(yq eval ".targets.${target}" "$sketchdir"/ci.yml 2>/dev/null)
+        selected_platform=$(yq eval ".platforms.${platform}" "$sketchdir"/ci.yml 2>/dev/null)
 
         if [[ $is_target == "false" ]] || [[ $selected_platform == "false" ]]; then
             printf "\033[93mSkipping %s test for %s, platform: %s\033[0m\n" "$sketchname" "$target" "$platform"
@@ -68,17 +68,17 @@ function run_test {
         fqbn="Default"
 
         if [ "$len" -ne 1 ]; then
-            fqbn=$(jq -r --arg target "$target" --argjson i "$i" '.fqbn[$target] | sort | .[$i]' "$sketchdir"/ci.json)
-        elif [ -f "$sketchdir"/ci.json ]; then
-            has_fqbn=$(jq -r --arg target "$target" '.fqbn[$target]' "$sketchdir"/ci.json)
+            fqbn=$(yq eval ".fqbn.${target} | sort | .[${i}]" "$sketchdir"/ci.yml 2>/dev/null)
+        elif [ -f "$sketchdir"/ci.yml ]; then
+            has_fqbn=$(yq eval ".fqbn.${target}" "$sketchdir"/ci.yml 2>/dev/null)
             if [ "$has_fqbn" != "null" ]; then
-                fqbn=$(jq -r --arg target "$target" '.fqbn[$target] | .[0]' "$sketchdir"/ci.json)
+                fqbn=$(yq eval ".fqbn.${target} | .[0]" "$sketchdir"/ci.yml 2>/dev/null)
             fi
         fi
 
         printf "\033[95mRunning test: %s -- Config: %s\033[0m\n" "$sketchname" "$fqbn"
         if [ "$erase_flash" -eq 1 ]; then
-            esptool.py -c "$target" erase_flash
+            esptool -c "$target" erase-flash
         fi
 
         if [ "$len" -ne 1 ]; then
diff --git a/.github/workflows/build_component.yml b/.github/workflows/build_component.yml
index bc32f7a8999..e5c0f244f65 100644
--- a/.github/workflows/build_component.yml
+++ b/.github/workflows/build_component.yml
@@ -205,6 +205,14 @@ jobs:
       - name: Setup jq
         uses: dcarbone/install-jq-action@e397bd87438d72198f81efd21f876461183d383a # v3.0.1
 
+      - name: Setup yq
+        run: |
+          YQ_VERSION="v4.48.1"
+          YQ_BINARY=yq_linux_amd64
+          wget -q https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O /usr/bin/yq
+          chmod +x /usr/bin/yq
+          yq --version
+
       - name: Download affected examples
         uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 690993504c2..67ae7505c04 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -29,7 +29,7 @@ on:
       - "libraries/**/*.c"
       - "libraries/**/*.h"
       - "libraries/**/*.ino"
-      - "libraries/**/ci.json"
+      - "libraries/**/ci.yml"
       - "package/**"
       - "tools/get.*"
       - "platform.txt"
@@ -188,9 +188,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
       - uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.0.4
         with:
           python-version: "3.x"
+
+      # Already installed by default in MacOS and Linux
+      - name: Install yq (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          choco install yq -y
+          yq --version
+
       - name: Build Sketches
         run: bash ./.github/scripts/on-push.sh
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8c46ef07661..6807f108b49 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,9 +4,8 @@
 # As the Wokwi tests require access to secrets, they are run in a separate workflow.
 # We need to ensure that the artifacts from previous tests in the chain are propagated for publishing the results.
 # This is the current trigger sequence for the tests:
-#  tests.yml -> tests_wokwi.yml -> tests_results.yml
+#  tests.yml -> tests_hw_wokwi.yml -> tests_results.yml
 #   ⌙> tests_build.yml
-#   ⌙> tests_hw.yml
 #   ⌙> tests_qemu.yml
 
 name: Runtime Tests
@@ -54,10 +53,10 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       build-types: ${{ steps.set-matrix.outputs.build-types }}
-      hw-types: ${{ steps.set-matrix.outputs.hw-types }}
-      wokwi-types: ${{ steps.set-matrix.outputs.wokwi-types }}
+      build-targets: ${{ steps.set-matrix.outputs.build-targets }}
+      qemu-enabled: ${{ steps.set-matrix.outputs.qemu-enabled }}
       qemu-types: ${{ steps.set-matrix.outputs.qemu-types }}
-      targets: ${{ steps.set-matrix.outputs.targets }}
+      qemu-targets: ${{ steps.set-matrix.outputs.qemu-targets }}
     env:
       IS_PR: ${{ github.event.pull_request.number != null }}
       PERFORMANCE_ENABLED: ${{ contains(github.event.pull_request.labels.*.name, 'perf_test') }}
@@ -84,22 +83,21 @@ jobs:
     strategy:
       matrix:
         type: ${{ fromJson(needs.gen-matrix.outputs.build-types) }}
-        chip: ${{ fromJson(needs.gen-matrix.outputs.targets) }}
+        chip: ${{ fromJson(needs.gen-matrix.outputs.build-targets) }}
     with:
       type: ${{ matrix.type }}
       chip: ${{ matrix.chip }}
 
-  # This job is disabled for now
   call-qemu-tests:
     name: QEMU
     uses: ./.github/workflows/tests_qemu.yml
     needs: [gen-matrix, call-build-tests]
-    if: false
+    if: ${{ needs.gen-matrix.outputs.qemu-enabled == 'true' }}
     strategy:
       fail-fast: false
       matrix:
         type: ${{ fromJson(needs.gen-matrix.outputs.qemu-types) }}
-        chip: ["esp32", "esp32c3"]
+        chip: ${{ fromJson(needs.gen-matrix.outputs.qemu-targets) }}
     with:
       type: ${{ matrix.type }}
       chip: ${{ matrix.chip }}
diff --git a/.github/workflows/tests_build.yml b/.github/workflows/tests_build.yml
index bf5a33f538f..cd28cc9afbf 100644
--- a/.github/workflows/tests_build.yml
+++ b/.github/workflows/tests_build.yml
@@ -33,6 +33,7 @@ jobs:
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/*.elf
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/*.json
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/sdkconfig
+            ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/ci.yml
 
       - name: Evaluate if tests should be built
         id: check-build
@@ -80,6 +81,7 @@ jobs:
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/*.elf
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/*.json
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/sdkconfig
+            ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/ci.yml
 
       - name: Upload ${{ inputs.chip }} ${{ inputs.type }} binaries as artifacts
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -91,3 +93,4 @@ jobs:
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/*.elf
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/*.json
             ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/sdkconfig
+            ~/.arduino/tests/${{ inputs.chip }}/**/build*.tmp/ci.yml
diff --git a/.github/workflows/tests_hw_wokwi.yml b/.github/workflows/tests_hw_wokwi.yml
index 14e7085eabb..6603cdf39a0 100644
--- a/.github/workflows/tests_hw_wokwi.yml
+++ b/.github/workflows/tests_hw_wokwi.yml
@@ -24,10 +24,12 @@ jobs:
       pr_num: ${{ steps.set-ref.outputs.pr_num }}
       ref: ${{ steps.set-ref.outputs.ref }}
       base: ${{ steps.set-ref.outputs.base }}
-      targets: ${{ steps.set-ref.outputs.targets }}
-      wokwi_types: ${{ steps.set-ref.outputs.wokwi_types }}
       hw_types: ${{ steps.set-ref.outputs.hw_types }}
+      hw_targets: ${{ steps.set-ref.outputs.hw_targets }}
+      wokwi_types: ${{ steps.set-ref.outputs.wokwi_types }}
+      wokwi_targets: ${{ steps.set-ref.outputs.wokwi_targets }}
       hw_tests_enabled: ${{ steps.set-ref.outputs.hw_tests_enabled }}
+      wokwi_tests_enabled: ${{ steps.set-ref.outputs.wokwi_tests_enabled }}
       push_time: ${{ steps.set-ref.outputs.push_time }}
     steps:
       - name: Report pending
@@ -67,8 +69,13 @@ jobs:
           path: artifacts/matrix_info
 
       - name: Get info
+        env:
+          GITLAB_ACCESS_TOKEN: ${{ secrets.GITLAB_ACCESS_TOKEN }}
+          WOKWI_CLI_TOKEN: ${{ secrets.WOKWI_CLI_TOKEN }}
         id: set-ref
         run: |
+          # Get info and sanitize it to avoid security issues
+
           pr_num=$(jq -r '.pull_request.number' artifacts/event_file/event.json | tr -cd "[:digit:]")
           if [ -z "$pr_num" ] || [ "$pr_num" == "null" ]; then
             pr_num=""
@@ -89,16 +96,28 @@ jobs:
             base=${{ github.ref }}
           fi
 
-          hw_tests_enabled="true"
-          if [[ -n "$pr_num" ]]; then
-            # This is a PR, check for hil_test label
-            has_hil_label=$(jq -r '.pull_request.labels[]?.name' artifacts/event_file/event.json 2>/dev/null | grep -q "hil_test" && echo "true" || echo "false")
-            echo "Has hil_test label: $has_hil_label"
+          if [ -n "$GITLAB_ACCESS_TOKEN" ]; then
+            hw_tests_enabled="true"
+            if [[ -n "$pr_num" ]]; then
+              # This is a PR, check for hil_test label
+              has_hil_label=$(jq -r '.pull_request.labels[]?.name' artifacts/event_file/event.json 2>/dev/null | grep -q "hil_test" && echo "true" || echo "false")
+              echo "Has hil_test label: $has_hil_label"
 
-            if [[ "$has_hil_label" != "true" ]]; then
-              echo "PR does not have hil_test label, hardware tests will be disabled"
-              hw_tests_enabled="false"
+              if [[ "$has_hil_label" != "true" ]]; then
+                echo "PR does not have hil_test label, hardware tests will be disabled"
+                hw_tests_enabled="false"
+              fi
             fi
+          else
+            echo "GITLAB_ACCESS_TOKEN is not set, hardware tests will be disabled"
+            hw_tests_enabled="false"
+          fi
+
+          if [ -n "$WOKWI_CLI_TOKEN" ]; then
+            wokwi_tests_enabled="true"
+          else
+            echo "WOKWI_CLI_TOKEN is not set, wokwi tests will be disabled"
+            wokwi_tests_enabled="false"
           fi
 
           push_time=$(jq -r '.repository.pushed_at' artifacts/event_file/event.json | tr -cd "[:alnum:]:-")
@@ -106,55 +125,74 @@ jobs:
             push_time=""
           fi
 
-          wokwi_types=$(cat artifacts/matrix_info/wokwi_types.txt | tr -cd "[:alpha:],[]'")
-          hw_types=$(cat artifacts/matrix_info/hw_types.txt | tr -cd "[:alpha:],[]'")
-          targets=$(cat artifacts/matrix_info/targets.txt | tr -cd "[:alnum:],[]'")
+          hw_targets=$(jq -c '.hw_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
+          hw_types=$(jq -c '.hw_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
+          wokwi_targets=$(jq -c '.wokwi_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
+          wokwi_types=$(jq -c '.wokwi_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
+          qemu_tests_enabled=$(jq -r '.qemu_enabled' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:]")
+          qemu_targets=$(jq -c '.qemu_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
+          qemu_types=$(jq -c '.qemu_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
 
           echo "base = $base"
-          echo "targets = $targets"
-          echo "wokwi_types = $wokwi_types"
+          echo "hw_targets = $hw_targets"
           echo "hw_types = $hw_types"
+          echo "wokwi_targets = $wokwi_targets"
+          echo "wokwi_types = $wokwi_types"
+          echo "qemu_tests_enabled = $qemu_tests_enabled"
+          echo "qemu_targets = $qemu_targets"
+          echo "qemu_types = $qemu_types"
           echo "pr_num = $pr_num"
           echo "hw_tests_enabled = $hw_tests_enabled"
+          echo "wokwi_tests_enabled = $wokwi_tests_enabled"
           echo "push_time = $push_time"
 
-          printf "$ref" >> artifacts/ref.txt
-          printf "Ref = "
-          cat artifacts/ref.txt
-
-          printf "${{ github.event.workflow_run.event }}" >> artifacts/event.txt
-          printf "\nEvent name = "
-          cat artifacts/event.txt
-
-          printf "${{ github.event.workflow_run.head_sha || github.sha }}" >> artifacts/sha.txt
-          printf "\nHead SHA = "
-          cat artifacts/sha.txt
-
-          printf "$action" >> artifacts/action.txt
-          printf "\nAction = "
-          cat artifacts/action.txt
-
-          printf "${{ github.event.workflow_run.id }}" >> artifacts/run_id.txt
-          printf "\nRun ID = "
-          cat artifacts/run_id.txt
+          conclusion="${{ github.event.workflow_run.conclusion }}"
+          run_id="${{ github.event.workflow_run.id }}"
+          event="${{ github.event.workflow_run.event }}"
+          sha="${{ github.event.workflow_run.head_sha || github.sha }}"
+
+          # Create a single JSON file with all workflow run information
+          cat > artifacts/workflow_info.json <<EOF
+          {
+            "hw_tests_enabled": $hw_tests_enabled,
+            "hw_targets": $hw_targets,
+            "hw_types": $hw_types,
+            "wokwi_tests_enabled": $wokwi_tests_enabled,
+            "wokwi_targets": $wokwi_targets,
+            "wokwi_types": $wokwi_types,
+            "qemu_tests_enabled": $qemu_tests_enabled,
+            "qemu_targets": $qemu_targets,
+            "qemu_types": $qemu_types,
+            "ref": "$ref",
+            "event": "$event",
+            "sha": "$sha",
+            "action": "$action",
+            "run_id": "$run_id",
+            "conclusion": "$conclusion"
+          }
+          EOF
+
+          echo "Ref = $ref"
+          echo "Event name = $event"
+          echo "Head SHA = $sha"
+          echo "Action = $action"
+          echo "Run ID = $run_id"
+          echo "Conclusion = $conclusion"
 
           if [ -z "$ref" ] || [ "$ref" == "null" ]; then
             echo "Failed to get PR number or ref"
             exit 1
           fi
 
-          conclusion="${{ github.event.workflow_run.conclusion }}"
-          printf "$conclusion" >> artifacts/conclusion.txt
-          printf "\nConclusion = "
-          cat artifacts/conclusion.txt
-
           echo "pr_num=$pr_num" >> $GITHUB_OUTPUT
           echo "base=$base" >> $GITHUB_OUTPUT
-          echo "targets=$targets" >> $GITHUB_OUTPUT
-          echo "wokwi_types=$wokwi_types" >> $GITHUB_OUTPUT
+          echo "hw_targets=$hw_targets" >> $GITHUB_OUTPUT
           echo "hw_types=$hw_types" >> $GITHUB_OUTPUT
+          echo "wokwi_targets=$wokwi_targets" >> $GITHUB_OUTPUT
+          echo "wokwi_types=$wokwi_types" >> $GITHUB_OUTPUT
           echo "ref=$ref" >> $GITHUB_OUTPUT
           echo "hw_tests_enabled=$hw_tests_enabled" >> $GITHUB_OUTPUT
+          echo "wokwi_tests_enabled=$wokwi_tests_enabled" >> $GITHUB_OUTPUT
           echo "push_time=$push_time" >> $GITHUB_OUTPUT
 
       - name: Download and extract parent QEMU results
@@ -256,8 +294,9 @@ jobs:
 
           echo "enabled=$enabled" >> $GITHUB_OUTPUT
 
-      - name: Wait for GitLab sync
+      - name: Wait for GitLab sync and prepare variables
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
+        id: prepare-variables
         env:
           PUSH_TIME: ${{ needs.get-artifacts.outputs.push_time }}
         run: |
@@ -299,6 +338,16 @@ jobs:
 
           echo "Proceeding with GitLab pipeline trigger..."
 
+          # Make targets/types comma-separated strings (remove brackets and quotes)
+          test_types=$(printf '%s' "${{ needs.get-artifacts.outputs.hw_types }}" | sed -e 's/[][]//g' -e 's/"//g')
+          test_chips=$(printf '%s' "${{ needs.get-artifacts.outputs.hw_targets }}" | sed -e 's/[][]//g' -e 's/"//g')
+          echo "test_types=$test_types"
+          echo "test_chips=$test_chips"
+
+          # Expose as step outputs
+          echo "test_types=$test_types" >> $GITHUB_OUTPUT
+          echo "test_chips=$test_chips" >> $GITHUB_OUTPUT
+
       - name: Trigger GitLab Pipeline and Download Artifacts
         if: ${{ steps.check-tests.outputs.enabled == 'true' }}
         uses: digital-blueprint/gitlab-pipeline-trigger-action@20e77989b24af658ba138a0aa5291bdc657f1505 # v1.3.0
@@ -312,7 +361,7 @@ jobs:
           download_artifacts: 'true'
           download_artifacts_on_failure: 'true'
           download_path: './gitlab-artifacts'
-          variables: '{"TEST_TYPES":"${{ needs.get-artifacts.outputs.hw_types }}","TEST_CHIPS":"${{ needs.get-artifacts.outputs.targets }}","PIPELINE_ID":"${{ env.id }}","BINARIES_RUN_ID":"${{ github.event.workflow_run.id }}","GITHUB_REPOSITORY":"${{ github.repository }}"}'
+          variables: '{"TEST_TYPES":"${{ steps.prepare-variables.outputs.test_types }}","TEST_CHIPS":"${{ steps.prepare-variables.outputs.test_chips }}","PIPELINE_ID":"${{ env.id }}","BINARIES_RUN_ID":"${{ github.event.workflow_run.id }}","GITHUB_REPOSITORY":"${{ github.repository }}"}'
 
       - name: Process Downloaded Artifacts
         if: ${{ always() && steps.check-tests.outputs.enabled == 'true' }}
@@ -388,9 +437,10 @@ jobs:
   wokwi-test:
     name: Wokwi ${{ matrix.chip }} ${{ matrix.type }} tests
     if: |
-      github.event.workflow_run.conclusion == 'success' ||
+      (github.event.workflow_run.conclusion == 'success' ||
       github.event.workflow_run.conclusion == 'failure' ||
-      github.event.workflow_run.conclusion == 'timed_out'
+      github.event.workflow_run.conclusion == 'timed_out') &&
+      needs.get-artifacts.outputs.wokwi_tests_enabled == 'true'
     runs-on: ubuntu-latest
     needs: get-artifacts
     env:
@@ -402,7 +452,7 @@ jobs:
       fail-fast: false
       matrix:
         type: ${{ fromJson(needs.get-artifacts.outputs.wokwi_types) }}
-        chip: ${{ fromJson(needs.get-artifacts.outputs.targets) }}
+        chip: ${{ fromJson(needs.get-artifacts.outputs.wokwi_targets) }}
     steps:
       - name: Report pending
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
diff --git a/.github/workflows/tests_results.yml b/.github/workflows/tests_results.yml
index 525b303e486..7b638a0e972 100644
--- a/.github/workflows/tests_results.yml
+++ b/.github/workflows/tests_results.yml
@@ -21,6 +21,15 @@ jobs:
       original_ref: ${{ steps.get-info.outputs.original_ref }}
       original_conclusion: ${{ steps.get-info.outputs.original_conclusion }}
       original_run_id: ${{ steps.get-info.outputs.original_run_id }}
+      hw_tests_enabled: ${{ steps.get-info.outputs.hw_tests_enabled }}
+      hw_targets: ${{ steps.get-info.outputs.hw_targets }}
+      hw_types: ${{ steps.get-info.outputs.hw_types }}
+      wokwi_tests_enabled: ${{ steps.get-info.outputs.wokwi_tests_enabled }}
+      wokwi_targets: ${{ steps.get-info.outputs.wokwi_targets }}
+      wokwi_types: ${{ steps.get-info.outputs.wokwi_types }}
+      qemu_tests_enabled: ${{ steps.get-info.outputs.qemu_tests_enabled }}
+      qemu_targets: ${{ steps.get-info.outputs.qemu_targets }}
+      qemu_types: ${{ steps.get-info.outputs.qemu_types }}
     steps:
       - name: Download and Extract Artifacts
         uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
@@ -31,36 +40,34 @@ jobs:
       - name: Get original info
         id: get-info
         run: |
-          echo "Artifacts:"
-          ls -laR ./artifacts
+          # Inputs in workflow_info.json are already sanitized and safe to use
 
-          original_event=$(cat ./artifacts/parent-artifacts/event.txt)
-          original_action=$(cat ./artifacts/parent-artifacts/action.txt)
-          original_sha=$(cat ./artifacts/parent-artifacts/sha.txt)
-          original_ref=$(cat ./artifacts/parent-artifacts/ref.txt)
-          original_conclusion=$(cat ./artifacts/parent-artifacts/conclusion.txt)
-          original_run_id=$(cat ./artifacts/parent-artifacts/run_id.txt)
+          original_event=$(jq -r '.event' ./artifacts/parent-artifacts/workflow_info.json)
+          original_action=$(jq -r '.action' ./artifacts/parent-artifacts/workflow_info.json)
+          original_sha=$(jq -r '.sha' ./artifacts/parent-artifacts/workflow_info.json)
+          original_ref=$(jq -r '.ref' ./artifacts/parent-artifacts/workflow_info.json)
+          original_conclusion=$(jq -r '.conclusion' ./artifacts/parent-artifacts/workflow_info.json)
+          original_run_id=$(jq -r '.run_id' ./artifacts/parent-artifacts/workflow_info.json)
 
-          # Sanitize the values to avoid security issues
-
-          # Event: Allow alphabetical characters and underscores
-          original_event=$(echo "$original_event" | tr -cd '[:alpha:]_')
-
-          # Action: Allow alphabetical characters and underscores
-          original_action=$(echo "$original_action" | tr -cd '[:alpha:]_')
-
-          # SHA: Allow alphanumeric characters
-          original_sha=$(echo "$original_sha" | tr -cd '[:alnum:]')
-
-          # Ref: Allow alphanumeric characters, slashes, underscores, dots, and dashes
-          original_ref=$(echo "$original_ref" | tr -cd '[:alnum:]/_.-')
-
-          # Conclusion: Allow alphabetical characters and underscores
-          original_conclusion=$(echo "$original_conclusion" | tr -cd '[:alpha:]_')
-
-          # Run ID: Allow numeric characters
-          original_run_id=$(echo "$original_run_id" | tr -cd '[:digit:]')
+          hw_tests_enabled=$(jq -r '.hw_tests_enabled' ./artifacts/parent-artifacts/workflow_info.json)
+          hw_targets=$(jq -c '.hw_targets' ./artifacts/parent-artifacts/workflow_info.json)
+          hw_types=$(jq -c '.hw_types' ./artifacts/parent-artifacts/workflow_info.json)
+          wokwi_tests_enabled=$(jq -r '.wokwi_tests_enabled' ./artifacts/parent-artifacts/workflow_info.json)
+          wokwi_targets=$(jq -c '.wokwi_targets' ./artifacts/parent-artifacts/workflow_info.json)
+          wokwi_types=$(jq -c '.wokwi_types' ./artifacts/parent-artifacts/workflow_info.json)
+          qemu_tests_enabled=$(jq -r '.qemu_tests_enabled' ./artifacts/parent-artifacts/workflow_info.json)
+          qemu_targets=$(jq -c '.qemu_targets' ./artifacts/parent-artifacts/workflow_info.json)
+          qemu_types=$(jq -c '.qemu_types' ./artifacts/parent-artifacts/workflow_info.json)
 
+          echo "hw_tests_enabled=$hw_tests_enabled" >> $GITHUB_OUTPUT
+          echo "hw_targets=$hw_targets" >> $GITHUB_OUTPUT
+          echo "hw_types=$hw_types" >> $GITHUB_OUTPUT
+          echo "wokwi_tests_enabled=$wokwi_tests_enabled" >> $GITHUB_OUTPUT
+          echo "wokwi_targets=$wokwi_targets" >> $GITHUB_OUTPUT
+          echo "wokwi_types=$wokwi_types" >> $GITHUB_OUTPUT
+          echo "qemu_tests_enabled=$qemu_tests_enabled" >> $GITHUB_OUTPUT
+          echo "qemu_targets=$qemu_targets" >> $GITHUB_OUTPUT
+          echo "qemu_types=$qemu_types" >> $GITHUB_OUTPUT
           echo "original_event=$original_event" >> $GITHUB_OUTPUT
           echo "original_action=$original_action" >> $GITHUB_OUTPUT
           echo "original_sha=$original_sha" >> $GITHUB_OUTPUT
@@ -68,6 +75,15 @@ jobs:
           echo "original_conclusion=$original_conclusion" >> $GITHUB_OUTPUT
           echo "original_run_id=$original_run_id" >> $GITHUB_OUTPUT
 
+          echo "hw_tests_enabled = $hw_tests_enabled"
+          echo "hw_targets = $hw_targets"
+          echo "hw_types = $hw_types"
+          echo "wokwi_tests_enabled = $wokwi_tests_enabled"
+          echo "wokwi_targets = $wokwi_targets"
+          echo "wokwi_types = $wokwi_types"
+          echo "qemu_tests_enabled = $qemu_tests_enabled"
+          echo "qemu_targets = $qemu_targets"
+          echo "qemu_types = $qemu_types"
           echo "original_event = $original_event"
           echo "original_action = $original_action"
           echo "original_sha = $original_sha"
@@ -107,13 +123,41 @@ jobs:
           run_id: ${{ github.event.workflow_run.id }}
           path: ./artifacts
 
+      - name: Download and Extract Artifacts
+        uses: dawidd6/action-download-artifact@07ab29fd4a977ae4d2b275087cf67563dfdf0295 # v9
+        with:
+          run_id: ${{ needs.get-artifacts.outputs.original_run_id }}
+          path: ./build_artifacts
+
+      - name: Generate JUnit files for missing runs
+        env:
+          GH_TOKEN: ${{ github.token }}
+          HW_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.hw_tests_enabled }}
+          HW_TARGETS: ${{ needs.get-artifacts.outputs.hw_targets }}
+          HW_TYPES: ${{ needs.get-artifacts.outputs.hw_types }}
+          WOKWI_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.wokwi_tests_enabled }}
+          WOKWI_TARGETS: ${{ needs.get-artifacts.outputs.wokwi_targets }}
+          WOKWI_TYPES: ${{ needs.get-artifacts.outputs.wokwi_types }}
+          QEMU_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.qemu_tests_enabled }}
+          QEMU_TARGETS: ${{ needs.get-artifacts.outputs.qemu_targets }}
+          QEMU_TYPES: ${{ needs.get-artifacts.outputs.qemu_types }}
+        run: |
+          ls -la ./artifacts
+          ls -la ./build_artifacts
+          pip3 install pyyaml
+          wget https://raw.githubusercontent.com/${{ github.repository }}/master/.github/scripts/generate_missing_junits.py -O ./generate_missing_junits.py
+          python3 ./generate_missing_junits.py ./build_artifacts ./artifacts ./test_errors
+
       - name: Publish Unit Test Results
+        id: publish-test-results
         uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
         with:
           commit: ${{ needs.get-artifacts.outputs.original_sha }}
           event_file: ./artifacts/parent-artifacts/event_file/event.json
           event_name: ${{ needs.get-artifacts.outputs.original_event }}
-          files: ./artifacts/**/*.xml
+          files: |
+            ./artifacts/**/*.xml
+            ./test_errors/**/*.xml
           action_fail: true
           action_fail_on_inconclusive: true
           compare_to_earlier_commit: false
@@ -128,16 +172,6 @@ jobs:
           overwrite: true
           path: ./unity_results.json
 
-      - name: Fail if tests failed
-        if: |
-          needs.get-artifacts.outputs.original_conclusion == 'failure' ||
-          needs.get-artifacts.outputs.original_conclusion == 'cancelled' ||
-          needs.get-artifacts.outputs.original_conclusion == 'timed_out' ||
-          github.event.workflow_run.conclusion == 'failure' ||
-          github.event.workflow_run.conclusion == 'cancelled' ||
-          github.event.workflow_run.conclusion == 'timed_out'
-        run: exit 1
-
       - name: Clean up caches
         if: always()
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
@@ -206,22 +240,36 @@ jobs:
           (needs.get-artifacts.outputs.original_event == 'schedule' ||
            needs.get-artifacts.outputs.original_event == 'workflow_dispatch')
         env:
-          REPORT_FILE: ./runtime-test-results/RUNTIME_TEST_RESULTS.md
+          HW_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.hw_tests_enabled }}
+          HW_TARGETS: ${{ needs.get-artifacts.outputs.hw_targets }}
+          HW_TYPES: ${{ needs.get-artifacts.outputs.hw_types }}
+          WOKWI_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.wokwi_tests_enabled }}
+          WOKWI_TARGETS: ${{ needs.get-artifacts.outputs.wokwi_targets }}
+          WOKWI_TYPES: ${{ needs.get-artifacts.outputs.wokwi_types }}
+          QEMU_TESTS_ENABLED: ${{ needs.get-artifacts.outputs.qemu_tests_enabled }}
+          QEMU_TARGETS: ${{ needs.get-artifacts.outputs.qemu_targets }}
+          QEMU_TYPES: ${{ needs.get-artifacts.outputs.qemu_types }}
           WOKWI_RUN_ID: ${{ github.event.workflow_run.id }}
           BUILD_RUN_ID: ${{ needs.get-artifacts.outputs.original_run_id }}
-          IS_FAILING: |
-            needs.get-artifacts.outputs.original_conclusion == 'failure' ||
-            needs.get-artifacts.outputs.original_conclusion == 'cancelled' ||
-            needs.get-artifacts.outputs.original_conclusion == 'timed_out' ||
-            github.event.workflow_run.conclusion == 'failure' ||
-            github.event.workflow_run.conclusion == 'cancelled' ||
-            github.event.workflow_run.conclusion == 'timed_out' ||
-            job.status == 'failure'
+          RESULTS_URL: ${{ fromJSON( steps.publish-test-results.outputs.json ).check_url }}
+          RESULTS_RUN_ID: ${{ github.run_id }}
+          REPORT_FILE: ./runtime-test-results/RUNTIME_TEST_RESULTS.md
+          IS_FAILING: >-
+            ${{
+              needs.get-artifacts.outputs.original_conclusion == 'failure' ||
+              needs.get-artifacts.outputs.original_conclusion == 'cancelled' ||
+              needs.get-artifacts.outputs.original_conclusion == 'timed_out' ||
+              github.event.workflow_run.conclusion == 'failure' ||
+              github.event.workflow_run.conclusion == 'cancelled' ||
+              github.event.workflow_run.conclusion == 'timed_out' ||
+              job.status == 'failure'
+            }}
         run: |
           rm -rf artifacts $REPORT_FILE
           mv -f ./unity_results.json ./runtime-test-results/unity_results.json
           touch $REPORT_FILE
-          python3 ./runtime-test-results/table_generator.py ./runtime-test-results/unity_results.json >> $REPORT_FILE
+          wget https://raw.githubusercontent.com/${{ github.repository }}/master/.github/scripts/runtime_table_generator.py -O ./runtime-test-results/runtime_table_generator.py
+          python3 ./runtime-test-results/runtime_table_generator.py ./runtime-test-results/unity_results.json ${{ needs.get-artifacts.outputs.original_sha }} >> $REPORT_FILE
           mv -f ./test_results.json ./runtime-test-results/test_results.json
 
       - name: Generate badge
@@ -250,7 +298,7 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           if [[ `git status --porcelain` ]]; then
-            git add --all
+            git add runtime-test-results/RUNTIME_TEST_RESULTS.md runtime-test-results/badge.svg runtime-test-results/test_results.json runtime-test-results/unity_results.json
             git commit -m "Updated runtime test results"
             git push origin HEAD:gh-pages
           fi
diff --git a/.gitlab/scripts/gen_hw_jobs.py b/.gitlab/scripts/gen_hw_jobs.py
index 804e245c18f..5dd77cf56af 100644
--- a/.gitlab/scripts/gen_hw_jobs.py
+++ b/.gitlab/scripts/gen_hw_jobs.py
@@ -8,6 +8,10 @@
 import copy
 import traceback
 from pathlib import Path
+from typing import Iterable
+from urllib.parse import urlencode
+import urllib.request
+import urllib.error
 
 # Resolve repository root from this script location
 SCRIPT_DIR = Path(__file__).resolve().parent
@@ -32,12 +36,12 @@ def str_representer(dumper, data):
     return dumper.represent_scalar("tag:yaml.org,2002:str", data, style=style)
 
 
-def read_json(p: Path):
+def read_yaml(p: Path):
     try:
         with p.open("r", encoding="utf-8") as f:
-            return json.load(f)
+            return yaml.safe_load(f) or {}
     except Exception as e:
-        sys.stderr.write(f"[WARN] Failed to parse JSON file '{p}': {e}\n")
+        sys.stderr.write(f"[WARN] Failed to parse YAML file '{p}': {e}\n")
         sys.stderr.write(traceback.format_exc() + "\n")
         return {}
 
@@ -46,7 +50,7 @@ def find_tests() -> list[Path]:
     tests = []
     if not TESTS_ROOT.exists():
         return tests
-    for ci in TESTS_ROOT.rglob("ci.json"):
+    for ci in TESTS_ROOT.rglob("ci.yml"):
         if ci.is_file():
             tests.append(ci)
     return tests
@@ -79,12 +83,11 @@ def find_sketch_test_dirs(types_filter: list[str]) -> list[tuple[str, Path]]:
 def load_tags_for_test(ci_json: dict, chip: str) -> set[str]:
     tags = set()
     # Global tags
-    for key in "tags":
-        v = ci_json.get(key)
-        if isinstance(v, list):
-            for e in v:
-                if isinstance(e, str) and e.strip():
-                    tags.add(e.strip())
+    v = ci_json.get("tags")
+    if isinstance(v, list):
+        for e in v:
+            if isinstance(e, str) and e.strip():
+                tags.add(e.strip())
     # Per-SoC tags
     soc_tags = ci_json.get("soc_tags")
     if isinstance(soc_tags, dict):
@@ -184,6 +187,147 @@ def parse_list_arg(s: str) -> list[str]:
     return [part.strip() for part in txt.split(",") if part.strip()]
 
 
+def _gitlab_auth_header() -> tuple[str, str]:
+    """Return header key and value for GitLab API auth, preferring PRIVATE-TOKEN, then JOB-TOKEN.
+
+    Falls back to empty auth if neither is available.
+    """
+    private = os.environ.get("GITLAB_API_TOKEN") or os.environ.get("PRIVATE_TOKEN")
+    if private:
+        return ("PRIVATE-TOKEN", private)
+    job = os.environ.get("CI_JOB_TOKEN")
+    if job:
+        return ("JOB-TOKEN", job)
+    return ("", "")
+
+
+def _gitlab_api_get(path: str) -> tuple[int, dict | list | None]:
+    """Perform a GET to GitLab API v4 and return (status_code, json_obj_or_None).
+
+    Uses project-level API base from CI env. Returns (0, None) if base env is missing.
+    """
+    base = os.environ.get("CI_API_V4_URL")
+    if not base:
+        return 0, None
+    url = base.rstrip("/") + "/" + path.lstrip("/")
+    key, value = _gitlab_auth_header()
+    req = urllib.request.Request(url)
+    if key:
+        req.add_header(key, value)
+    try:
+        with urllib.request.urlopen(req, timeout=15) as resp:
+            status = resp.getcode()
+            data = resp.read()
+            try:
+                obj = json.loads(data.decode("utf-8")) if data else None
+            except Exception:
+                obj = None
+            return status, obj
+    except urllib.error.HTTPError as e:
+        try:
+            body = e.read().decode("utf-8")
+        except Exception:
+            body = str(e)
+        sys.stderr.write(f"[WARN] GitLab API GET {url} failed: {e} body={body}\n")
+        return e.code, None
+    except Exception as e:
+        sys.stderr.write(f"[WARN] GitLab API GET {url} error: {e}\n")
+        sys.stderr.write(traceback.format_exc() + "\n")
+        return -1, None
+
+
+def list_project_runners() -> list[dict]:
+    """List runners available to this project via GitLab API.
+
+    Requires CI vars CI_API_V4_URL and CI_PROJECT_ID and either GITLAB_API_TOKEN or CI_JOB_TOKEN.
+    Returns an empty list if not accessible.
+    """
+    project_id = os.environ.get("CI_PROJECT_ID")
+    if not project_id:
+        return []
+
+    key, value = _gitlab_auth_header()
+    sys.stderr.write(f"[DEBUG] Attempting to list runners for project {project_id}\n")
+    sys.stderr.write(f"[DEBUG] Auth method: {'Authenticated' if key else 'None'}\n")
+
+    runners: list[dict] = []
+    page = 1
+    per_page = 100
+    while True:
+        q = urlencode({"per_page": per_page, "page": page})
+        status, obj = _gitlab_api_get(f"projects/{project_id}/runners?{q}")
+        if status != 200 or not isinstance(obj, list):
+            # Project-scoped listing might be restricted for JOB-TOKEN in some instances.
+            # Return what we have (likely nothing) and let caller decide.
+            if status == 403:
+                sys.stderr.write("\n[ERROR] 403 Forbidden when listing project runners\n")
+                sys.stderr.write(f"  Project ID: {project_id}\n")
+                sys.stderr.write(f"  Authentication: {'Present' if key else 'None'}\n")
+                sys.stderr.write("  Endpoint: projects/{project_id}/runners\n\n")
+
+                sys.stderr.write("Required permissions:\n")
+                sys.stderr.write("  - Token scope: 'api' (you likely have this)\n")
+                sys.stderr.write("  - Project role: Maintainer or Owner (you may be missing this)\n\n")
+
+                sys.stderr.write("Solutions:\n")
+                sys.stderr.write("  1. Ensure the token owner has Maintainer/Owner role on project {project_id}\n")
+                sys.stderr.write("  2. Use a Group Access Token if available (has higher privileges)\n")
+                sys.stderr.write("  3. Set environment variable: ASSUME_TAGGED_GROUPS_MISSING=0\n")
+                sys.stderr.write("     (This will skip runner enumeration and schedule all groups)\n\n")
+            break
+        runners.extend(x for x in obj if isinstance(x, dict))
+        if len(obj) < per_page:
+            break
+        page += 1
+
+    # The /projects/:id/runners endpoint returns simplified objects without tag_list.
+    # Fetch full details for each runner to get tags.
+    sys.stderr.write(f"[DEBUG] Fetching full details for {len(runners)} runners to get tags...\n")
+    full_runners = []
+    for runner in runners:
+        runner_id = runner.get("id")
+        if not runner_id:
+            continue
+        status, details = _gitlab_api_get(f"runners/{runner_id}")
+        if status == 200 and isinstance(details, dict):
+            full_runners.append(details)
+        else:
+            # If we can't get details, keep the basic info (no tags)
+            full_runners.append(runner)
+
+    return full_runners
+
+
+def runner_supports_tags(runner: dict, required_tags: Iterable[str]) -> bool:
+    tag_list = runner.get("tag_list") or []
+    if not isinstance(tag_list, list):
+        return False
+    tags = {str(t).strip() for t in tag_list if isinstance(t, str) and t.strip()}
+    if not tags:
+        return False
+    # Skip paused/inactive runners
+    if runner.get("paused") is True:
+        return False
+    if runner.get("active") is False:
+        return False
+    return all(t in tags for t in required_tags)
+
+
+def any_runner_matches(required_tags: Iterable[str], runners: list[dict]) -> bool:
+    req = [t for t in required_tags if t]
+    for r in runners:
+        try:
+            if runner_supports_tags(r, req):
+                return True
+        except Exception as e:
+            # Be robust to unexpected runner payloads
+            runner_id = r.get("id", "unknown")
+            sys.stderr.write(f"[WARN] Error checking runner #{runner_id} against required tags: {e}\n")
+            sys.stderr.write(traceback.format_exc() + "\n")
+            continue
+    return False
+
+
 def main():
     ap = argparse.ArgumentParser()
     ap.add_argument("--chips", required=True, help="Comma-separated or JSON array list of SoCs")
@@ -209,12 +353,12 @@ def main():
     # Aggregate mapping: (chip, frozenset(tags or generic), test_type) -> list of test paths
     group_map: dict[tuple[str, frozenset[str], str], list[str]] = {}
     all_ci = find_tests()
-    print(f"Discovered {len(all_ci)} ci.json files under tests/")
+    print(f"Discovered {len(all_ci)} ci.yml files under tests/")
 
     matched_count = 0
     for test_type, test_path in find_sketch_test_dirs(types):
-        ci_path = test_path / "ci.json"
-        ci = read_json(ci_path) if ci_path.exists() else {}
+        ci_path = test_path / "ci.yml"
+        ci = read_yaml(ci_path) if ci_path.exists() else {}
         test_dir = str(test_path)
         sketch = test_path.name
         for chip in chips:
@@ -249,26 +393,89 @@ def main():
 
     # Build child pipeline YAML in deterministic order
     jobs_entries = []  # list of (sort_key, job_name, job_dict)
+
+    # Discover available runners
+    available_runners = list_project_runners()
+    if not available_runners:
+        print("\n[ERROR] Could not enumerate project runners!")
+        print("This is required to match test groups to runners by tags.")
+        print("\nPossible causes:")
+        print("  - No runners are registered to the project")
+        print("  - API token lacks required permissions (needs 'api' scope + Maintainer/Owner role)")
+        print("  - Network/API connectivity issues")
+        sys.exit(1)
+
+    print(f"\n=== Available Runners ({len(available_runners)}) ===")
+    for runner in available_runners:
+        runner_id = runner.get("id", "?")
+        runner_desc = runner.get("description", "")
+        runner_tags = runner.get("tag_list", [])
+        runner_active = runner.get("active", False)
+        runner_paused = runner.get("paused", False)
+        status = "ACTIVE" if (runner_active and not runner_paused) else "INACTIVE/PAUSED"
+        print(f"  Runner #{runner_id} ({status}): {runner_desc}")
+        print(f"    Tags: {', '.join(runner_tags) if runner_tags else '(none)'}")
+    print("=" * 60 + "\n")
+
+    # Track skipped groups for reporting
+    skipped_groups: list[dict] = []
+
+    print("\n=== Test Group Scheduling ===")
     for (chip, tagset, test_type), test_dirs in group_map.items():
         tag_list = sorted(tagset)
         # Build name suffix excluding the SOC itself to avoid duplication
         non_soc_tags = [t for t in tag_list if t != chip]
         tag_suffix = "-".join(non_soc_tags) if non_soc_tags else "generic"
-        job_name = f"hw-{chip}-{test_type}-{tag_suffix}"[:255]
-
-        # Clone base job and adjust (preserve key order using deepcopy)
-        job = copy.deepcopy(base_job)
-        # Ensure tags include SOC+extras
-        job["tags"] = tag_list
-        vars_block = job.get("variables", {})
-        vars_block["TEST_CHIP"] = chip
-        vars_block["TEST_TYPE"] = test_type
-        # Provide list of test directories for this job
-        vars_block["TEST_LIST"] = "\n".join(sorted(test_dirs))
-        job["variables"] = vars_block
-
-        sort_key = (chip, test_type, tag_suffix)
-        jobs_entries.append((sort_key, job_name, job))
+
+        # Determine if any runner can serve this job
+        can_schedule = any_runner_matches(tag_list, available_runners)
+        print(f"  Group: {chip}-{test_type}-{tag_suffix}")
+        print(f"    Required tags: {', '.join(tag_list)}")
+        print(f"    Tests: {len(test_dirs)}")
+        if can_schedule:
+            print("    ✓ Runner found - scheduling")
+        else:
+            print("    ✗ NO RUNNER FOUND - skipping")
+
+        if can_schedule:
+            job_name = f"hw-{chip}-{test_type}-{tag_suffix}"[:255]
+
+            # Clone base job and adjust (preserve key order using deepcopy)
+            job = copy.deepcopy(base_job)
+            # Ensure tags include SOC+extras
+            job["tags"] = tag_list
+            vars_block = job.get("variables", {})
+            vars_block["TEST_CHIP"] = chip
+            vars_block["TEST_TYPE"] = test_type
+            # Provide list of test directories for this job
+            vars_block["TEST_LIST"] = "\n".join(sorted(test_dirs))
+            job["variables"] = vars_block
+
+            sort_key = (chip, test_type, tag_suffix)
+            jobs_entries.append((sort_key, job_name, job))
+        else:
+            # Track skipped groups for reporting
+            skipped_groups.append(
+                {
+                    "chip": chip,
+                    "test_type": test_type,
+                    "required_tags": tag_list,
+                    "test_count": len(test_dirs),
+                }
+            )
+
+    # Print summary
+    print("\n=== Summary ===")
+    print(f"  Scheduled groups: {len(jobs_entries)}")
+    print(f"  Skipped groups (no runner): {len(skipped_groups)}")
+    if skipped_groups:
+        print("\n  Skipped group details:")
+        for sg in skipped_groups:
+            chip = sg.get("chip")
+            test_type = sg.get("test_type")
+            tags = sg.get("required_tags", [])
+            test_count = sg.get("test_count", 0)
+            print(f"    - {chip}-{test_type}: requires tags {tags}, {test_count} tests")
 
     # Order jobs by (chip, type, tag_suffix)
     jobs = {}
diff --git a/.gitlab/scripts/install_dependencies.sh b/.gitlab/scripts/install_dependencies.sh
new file mode 100644
index 00000000000..ac7c6ff0b0a
--- /dev/null
+++ b/.gitlab/scripts/install_dependencies.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+export DEBIAN_FRONTEND=noninteractive
+
+echo "[deps] Updating apt indexes"
+apt-get update -y
+
+echo "[deps] Installing base packages"
+apt-get install -y jq unzip curl wget
+
+echo "[deps] Installing Python packages"
+pip3 install PyYAML
+
+echo "[deps] Installing yq (mikefarah/yq) for current architecture"
+YQ_VERSION="v4.48.1"
+ARCH="$(uname -m)"
+case "$ARCH" in
+    x86_64) YQ_BINARY=yq_linux_amd64 ;;
+    aarch64|arm64) YQ_BINARY=yq_linux_arm64 ;;
+    armv7l|armv6l|armhf|arm) YQ_BINARY=yq_linux_arm ;;
+    i386|i686) YQ_BINARY=yq_linux_386 ;;
+    *) echo "Unsupported architecture: $ARCH"; exit 1 ;;
+esac
+
+echo "[deps] Downloading mikefarah/yq $YQ_VERSION ($YQ_BINARY)"
+wget -q https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O /usr/bin/yq
+chmod +x /usr/bin/yq
+yq --version
+
+echo "[deps] Dependencies installed successfully"
diff --git a/.gitlab/workflows/hardware_tests_dynamic.yml b/.gitlab/workflows/hardware_tests_dynamic.yml
index 2c137f092ab..9b88fabab34 100644
--- a/.gitlab/workflows/hardware_tests_dynamic.yml
+++ b/.gitlab/workflows/hardware_tests_dynamic.yml
@@ -3,7 +3,7 @@
 ###############################
 
 # This parent workflow generates a dynamic child pipeline with jobs grouped
-# by SOC + runner tags derived from tests' ci.json, then triggers it and waits.
+# by SOC + runner tags derived from tests' ci.yml, then triggers it and waits.
 
 generate-hw-tests:
   stage: generate
@@ -16,9 +16,7 @@ generate-hw-tests:
     TEST_TYPES: $TEST_TYPES
     TEST_CHIPS: $TEST_CHIPS
   before_script:
-    - pip install PyYAML
-    - apt-get update
-    - apt-get install -y jq unzip curl
+    - bash .gitlab/scripts/install_dependencies.sh
   script:
     - mkdir -p ~/.arduino/tests
     - |
diff --git a/.gitlab/workflows/hw_test_template.yml b/.gitlab/workflows/hw_test_template.yml
index 1b09c2cb7eb..c18686bd115 100644
--- a/.gitlab/workflows/hw_test_template.yml
+++ b/.gitlab/workflows/hw_test_template.yml
@@ -33,8 +33,7 @@ hw-test-template:
     - echo "Running hardware tests for chip:$TEST_CHIP type:$TEST_TYPE"
     - echo "Pipeline ID:$PIPELINE_ID"
     - echo "Running hardware tests for chip:$TEST_CHIP"
-    - apt-get update
-    - apt-get install -y jq unzip curl
+    - bash .gitlab/scripts/install_dependencies.sh
     - rm -rf ~/.arduino/tests
     - mkdir -p ~/.arduino/tests/$TEST_CHIP
     - echo Fetching binaries for $TEST_CHIP $TEST_TYPE
diff --git a/docs/en/contributing.rst b/docs/en/contributing.rst
index 0a2ff38b95f..c9f83530d36 100644
--- a/docs/en/contributing.rst
+++ b/docs/en/contributing.rst
@@ -113,21 +113,18 @@ Testing
 *******
 
 Be sure you have tested the example in all the supported targets. If the example some specific hardware requirements,
-edit/add the ``ci.json`` in the same folder as the sketch to specify the regular expression for the
+edit/add the ``ci.yml`` in the same folder as the sketch to specify the regular expression for the
 required configurations from ``sdkconfig``.
 This will ensure that the CI system will run the test only on the targets that have the required configurations.
 
 You can check the available configurations in the ``sdkconfig`` file in the ``tools/esp32-arduino-libs/<target>`` folder.
 
-Here is an example of the ``ci.json`` file where the example requires Wi-Fi to work properly:
+Here is an example of the ``ci.yml`` file where the example requires Wi-Fi to work properly:
 
-.. code-block:: json
+.. code-block:: yaml
 
-    {
-      "requires": [
-        "CONFIG_SOC_WIFI_SUPPORTED=y"
-      ]
-    }
+    requires:
+      - CONFIG_SOC_WIFI_SUPPORTED=y
 
 .. note::
 
@@ -138,21 +135,17 @@ Here is an example of the ``ci.json`` file where the example requires Wi-Fi to w
     That means that the configuration must be at the beginning of the line in the ``sdkconfig`` file.
 
 Sometimes, the example might not be supported by some target, even if the target has the required configurations
-(like resources limitations or requiring a specific SoC). To avoid compilation errors, you can add the target to the ``ci.json``
+(like resources limitations or requiring a specific SoC). To avoid compilation errors, you can add the target to the ``ci.yml``
 file so the CI system will force to skip the test on that target.
 
-Here is an example of the ``ci.json`` file where the example is requires Wi-Fi to work properly but is also not supported by the ESP32-S2 target:
+Here is an example of the ``ci.yml`` file where the example is requires Wi-Fi to work properly but is also not supported by the ESP32-S2 target:
 
-.. code-block:: json
+.. code-block:: yaml
 
-    {
-      "requires": [
-        "CONFIG_SOC_WIFI_SUPPORTED=y"
-      ],
-      "targets": {
-        "esp32s2": false
-      }
-    }
+    requires:
+      - CONFIG_SOC_WIFI_SUPPORTED=y
+    targets:
+      esp32s2: false
 
 You also need to add this information in the ``README.md`` file, on the **Supported Targets**, and in the example code as an inline comment.
 For example, in the sketch:
@@ -183,29 +176,23 @@ Currently, the default FQBNs are:
 * ``espressif:esp32:esp32h2``
 * ``espressif:esp32:esp32p4:USBMode=default``
 
-There are two ways to alter the FQBNs used to compile the sketches: by using the ``fqbn`` or ``fqbn_append`` fields in the ``ci.json`` file.
+There are two ways to alter the FQBNs used to compile the sketches: by using the ``fqbn`` or ``fqbn_append`` fields in the ``ci.yml`` file.
 
 If you just want to append a string to the default FQBNs, you can use the ``fqbn_append`` field. For example, to add the ``DebugLevel=debug`` to the FQBNs, you would use:
 
-.. code-block:: json
+.. code-block:: yaml
 
-    {
-      "fqbn_append": "DebugLevel=debug"
-    }
+    fqbn_append: DebugLevel=debug
 
 If you want to override the default FQBNs, you can use the ``fqbn`` field. It is a dictionary where the key is the target name and the value is a list of FQBNs.
 The FQBNs in the list will be used in sequence to compile the sketch. For example, to compile a sketch for ESP32-S2 with and without PSRAM enabled, you would use:
 
-.. code-block:: json
+.. code-block:: yaml
 
-    {
-      "fqbn": {
-        "esp32s2": [
-          "espressif:esp32:esp32s2:PSRAM=enabled,FlashMode=dio",
-          "espressif:esp32:esp32s2:PSRAM=disabled,FlashMode=dio"
-        ]
-      }
-    }
+    fqbn:
+      esp32s2:
+        - espressif:esp32:esp32s2:PSRAM=enabled,FlashMode=dio
+        - espressif:esp32:esp32s2:PSRAM=disabled,FlashMode=dio
 
 .. note::
 
@@ -301,6 +288,13 @@ The tests are divided into two categories inside the ``tests`` folder:
   to the core and libraries have any big impact on the performance. These tests usually run for a longer time than the validation tests and include
   common benchmark tools like `CoreMark <https://github.com/eembc/coremark>`_.
 
+.. note::
+
+    Keep in mind that to run the CI scripts locally, you need to have the Go-based ``yq`` from `mikefarah/yq <https://github.com/mikefarah/yq>`_
+    installed and not the Python-based ``yq`` from PyPI or `kislyuk/yq <https://github.com/kislyuk/yq>`_.
+    The syntax is slightly different and will not work with the CI scripts.
+    You can install the Go-based ``yq`` through ``brew``, ``chocolatey`` or downloading the binary directly from the `releases page <https://github.com/mikefarah/yq/releases>`_.
+
 To run the runtime tests locally, first install the required dependencies by running:
 
 .. code-block:: bash
@@ -394,9 +388,9 @@ You can use the ``hello_world`` test suite as a starting point and the other tes
 
 A test suite contains the following files:
 
-* ``test_<test_name>.py``: The test file that contains the test cases. Required.
-* ``<test_name>.ino``: The sketch that will be tested. Required.
-* ``ci.json``: The file that specifies how the test suite will be run in the CI system. Optional.
+* ``test_<test_name>.py``: Is the test file that contains the test cases. Required.
+* ``<test_name>.ino``: This is the sketch that will be tested. Required.
+* ``ci.yml``: The file that specifies how the test suite will be run in the CI system. Optional.
 * ``diagram.<target>.json``: The diagram file that specifies the connections between the components in Wokwi. Optional.
 * Any other files that are needed for the test suite.
 
@@ -405,10 +399,10 @@ For more information about the Unity testing framework, you can check the `Unity
 
 After creating the test suite, make sure to test it locally and run it in the CI system to ensure that it works as expected.
 
-CI JSON File
+CI YAML File
 ############
 
-The ``ci.json`` file is used to specify how the test suite and sketches will handled by the CI system. It can contain the following fields:
+The ``ci.yml`` file is used to specify how the test suite and sketches will handled by the CI system. It can contain the following fields:
 
 * ``requires``: A list of configurations in ``sdkconfig`` that are required to run the test suite. The test suite will only run on the targets
   that have **ALL** the required configurations. By default, no configurations are required.
@@ -419,7 +413,9 @@ The ``ci.json`` file is used to specify how the test suite and sketches will han
   specified in the ``requires`` field. This field is also valid for examples.
 * ``platforms``: A dictionary that specifies the supported platforms. The key is the platform name and the value is a boolean that specifies if
   the platform is supported. By default, all platforms are assumed to be supported.
-* ``extra_tags``: A list of extra tags that the runner will require when running the test suite in hardware. By default, no extra tags are required.
+* ``tags``: A list of tags that all runners will require when running the test suite in hardware. By default, no tags are required.
+* ``soc_tags``: A dictionary that specifies SoC-specific tags required for hardware runners. The key is the target name and the value is a list
+  of tags. By default, no SoC-specific tags are required.
 * ``fqbn_append``: A string to be appended to the default FQBNs. By default, no string is appended. This has no effect if ``fqbn`` is specified.
 * ``fqbn``: A dictionary that specifies the FQBNs that will be used to compile the sketch. The key is the target name and the value is a list
   of FQBNs. The `default FQBNs <https://github.com/espressif/arduino-esp32/blob/a31a5fca1739993173caba995f7785b8eed6b30e/.github/scripts/sketch_utils.sh#L86-L91>`_
@@ -429,10 +425,10 @@ The ``ci.json`` file is used to specify how the test suite and sketches will han
   or by URL (e.g., ``https://github.com/arduino-libraries/WiFi101.git``).
   More information can be found in the `Arduino CLI documentation <https://arduino.github.io/arduino-cli/1.3/commands/arduino-cli_lib_install/>`_.
 
-The ``wifi`` test suite is a good example of how to use the ``ci.json`` file:
+The ``wifi`` test suite is a good example of how to use the ``ci.yml`` file:
 
-.. literalinclude:: ../../tests/validation/wifi/ci.json
-    :language: json
+.. literalinclude:: ../../tests/validation/wifi/ci.yml
+    :language: yaml
 
 Documentation Checks
 ^^^^^^^^^^^^^^^^^^^^
diff --git a/idf_component_examples/esp_matter_light/ci.json b/idf_component_examples/esp_matter_light/ci.json
deleted file mode 100644
index f23a085285d..00000000000
--- a/idf_component_examples/esp_matter_light/ci.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "targets": {
-    "esp32c2": false,
-    "esp32s2": false
-  },
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y",
-    "CONFIG_MBEDTLS_HKDF_C=y"
-  ]
-}
diff --git a/idf_component_examples/esp_matter_light/ci.yml b/idf_component_examples/esp_matter_light/ci.yml
new file mode 100644
index 00000000000..4eee72b8c3b
--- /dev/null
+++ b/idf_component_examples/esp_matter_light/ci.yml
@@ -0,0 +1,8 @@
+targets:
+  esp32c2: false
+  esp32s2: false
+
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
+  - CONFIG_MBEDTLS_HKDF_C=y
diff --git a/idf_component_examples/hw_cdc_hello_world/ci.json b/idf_component_examples/hw_cdc_hello_world/ci.json
deleted file mode 100644
index 80669afc2cc..00000000000
--- a/idf_component_examples/hw_cdc_hello_world/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED=y"
-  ]
-}
diff --git a/idf_component_examples/hw_cdc_hello_world/ci.yml b/idf_component_examples/hw_cdc_hello_world/ci.yml
new file mode 100644
index 00000000000..7415bc09cc4
--- /dev/null
+++ b/idf_component_examples/hw_cdc_hello_world/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED=y
diff --git a/libraries/ArduinoOTA/examples/BasicOTA/ci.json b/libraries/ArduinoOTA/examples/BasicOTA/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/ArduinoOTA/examples/BasicOTA/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/ArduinoOTA/examples/BasicOTA/ci.yml b/libraries/ArduinoOTA/examples/BasicOTA/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/ArduinoOTA/examples/BasicOTA/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/AsyncUDP/examples/AsyncUDPClient/ci.json b/libraries/AsyncUDP/examples/AsyncUDPClient/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/AsyncUDP/examples/AsyncUDPClient/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/AsyncUDP/examples/AsyncUDPClient/ci.yml b/libraries/AsyncUDP/examples/AsyncUDPClient/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/AsyncUDP/examples/AsyncUDPClient/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.json b/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.yml b/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/AsyncUDP/examples/AsyncUDPMulticastServer/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/AsyncUDP/examples/AsyncUDPServer/ci.json b/libraries/AsyncUDP/examples/AsyncUDPServer/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/AsyncUDP/examples/AsyncUDPServer/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/AsyncUDP/examples/AsyncUDPServer/ci.yml b/libraries/AsyncUDP/examples/AsyncUDPServer/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/AsyncUDP/examples/AsyncUDPServer/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/BLE/examples/BLE5_extended_scan/ci.json b/libraries/BLE/examples/BLE5_extended_scan/ci.json
deleted file mode 100644
index 8e938055cf2..00000000000
--- a/libraries/BLE/examples/BLE5_extended_scan/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_BLE_50_SUPPORTED=y",
-    "CONFIG_BLUEDROID_ENABLED=y"
-  ]
-}
diff --git a/libraries/BLE/examples/BLE5_extended_scan/ci.yml b/libraries/BLE/examples/BLE5_extended_scan/ci.yml
new file mode 100644
index 00000000000..304e725169c
--- /dev/null
+++ b/libraries/BLE/examples/BLE5_extended_scan/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_BLE_50_SUPPORTED=y
+  - CONFIG_BLUEDROID_ENABLED=y
diff --git a/libraries/BLE/examples/BLE5_multi_advertising/ci.json b/libraries/BLE/examples/BLE5_multi_advertising/ci.json
deleted file mode 100644
index 8e938055cf2..00000000000
--- a/libraries/BLE/examples/BLE5_multi_advertising/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_BLE_50_SUPPORTED=y",
-    "CONFIG_BLUEDROID_ENABLED=y"
-  ]
-}
diff --git a/libraries/BLE/examples/BLE5_multi_advertising/ci.yml b/libraries/BLE/examples/BLE5_multi_advertising/ci.yml
new file mode 100644
index 00000000000..304e725169c
--- /dev/null
+++ b/libraries/BLE/examples/BLE5_multi_advertising/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_BLE_50_SUPPORTED=y
+  - CONFIG_BLUEDROID_ENABLED=y
diff --git a/libraries/BLE/examples/BLE5_periodic_advertising/ci.json b/libraries/BLE/examples/BLE5_periodic_advertising/ci.json
deleted file mode 100644
index 8e938055cf2..00000000000
--- a/libraries/BLE/examples/BLE5_periodic_advertising/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_BLE_50_SUPPORTED=y",
-    "CONFIG_BLUEDROID_ENABLED=y"
-  ]
-}
diff --git a/libraries/BLE/examples/BLE5_periodic_advertising/ci.yml b/libraries/BLE/examples/BLE5_periodic_advertising/ci.yml
new file mode 100644
index 00000000000..304e725169c
--- /dev/null
+++ b/libraries/BLE/examples/BLE5_periodic_advertising/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_BLE_50_SUPPORTED=y
+  - CONFIG_BLUEDROID_ENABLED=y
diff --git a/libraries/BLE/examples/BLE5_periodic_sync/ci.json b/libraries/BLE/examples/BLE5_periodic_sync/ci.json
deleted file mode 100644
index 8e938055cf2..00000000000
--- a/libraries/BLE/examples/BLE5_periodic_sync/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_BLE_50_SUPPORTED=y",
-    "CONFIG_BLUEDROID_ENABLED=y"
-  ]
-}
diff --git a/libraries/BLE/examples/BLE5_periodic_sync/ci.yml b/libraries/BLE/examples/BLE5_periodic_sync/ci.yml
new file mode 100644
index 00000000000..304e725169c
--- /dev/null
+++ b/libraries/BLE/examples/BLE5_periodic_sync/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_BLE_50_SUPPORTED=y
+  - CONFIG_BLUEDROID_ENABLED=y
diff --git a/libraries/BLE/examples/Beacon_Scanner/ci.json b/libraries/BLE/examples/Beacon_Scanner/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Beacon_Scanner/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Beacon_Scanner/ci.yml b/libraries/BLE/examples/Beacon_Scanner/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Beacon_Scanner/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Client/ci.json b/libraries/BLE/examples/Client/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Client/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Client/ci.yml b/libraries/BLE/examples/Client/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Client/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Client_secure_static_passkey/ci.json b/libraries/BLE/examples/Client_secure_static_passkey/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Client_secure_static_passkey/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Client_secure_static_passkey/ci.yml b/libraries/BLE/examples/Client_secure_static_passkey/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Client_secure_static_passkey/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/EddystoneTLM_Beacon/ci.yml b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/EddystoneTLM_Beacon/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json b/libraries/BLE/examples/EddystoneURL_Beacon/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/EddystoneURL_Beacon/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/EddystoneURL_Beacon/ci.yml b/libraries/BLE/examples/EddystoneURL_Beacon/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/EddystoneURL_Beacon/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Notify/ci.json b/libraries/BLE/examples/Notify/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Notify/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Notify/ci.yml b/libraries/BLE/examples/Notify/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Notify/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Scan/ci.json b/libraries/BLE/examples/Scan/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Scan/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Scan/ci.yml b/libraries/BLE/examples/Scan/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Scan/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Server/ci.json b/libraries/BLE/examples/Server/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Server/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Server/ci.yml b/libraries/BLE/examples/Server/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Server/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Server_multiconnect/ci.json b/libraries/BLE/examples/Server_multiconnect/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Server_multiconnect/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Server_multiconnect/ci.yml b/libraries/BLE/examples/Server_multiconnect/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Server_multiconnect/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Server_secure_authorization/ci.json b/libraries/BLE/examples/Server_secure_authorization/ci.json
deleted file mode 100644
index 1e2d20da791..00000000000
--- a/libraries/BLE/examples/Server_secure_authorization/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "targets": {
-    "esp32": false
-  },
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_BLE_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Server_secure_authorization/ci.yml b/libraries/BLE/examples/Server_secure_authorization/ci.yml
new file mode 100644
index 00000000000..274bd2b41ed
--- /dev/null
+++ b/libraries/BLE/examples/Server_secure_authorization/ci.yml
@@ -0,0 +1,7 @@
+targets:
+  esp32: false
+
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_BLE_SUPPORTED=y
diff --git a/libraries/BLE/examples/Server_secure_static_passkey/ci.json b/libraries/BLE/examples/Server_secure_static_passkey/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Server_secure_static_passkey/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Server_secure_static_passkey/ci.yml b/libraries/BLE/examples/Server_secure_static_passkey/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Server_secure_static_passkey/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/UART/ci.json b/libraries/BLE/examples/UART/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/UART/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/UART/ci.yml b/libraries/BLE/examples/UART/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/UART/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/Write/ci.json b/libraries/BLE/examples/Write/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/Write/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/Write/ci.yml b/libraries/BLE/examples/Write/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/Write/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BLE/examples/iBeacon/ci.json b/libraries/BLE/examples/iBeacon/ci.json
deleted file mode 100644
index e9657aad729..00000000000
--- a/libraries/BLE/examples/iBeacon/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y"
-  ]
-}
diff --git a/libraries/BLE/examples/iBeacon/ci.yml b/libraries/BLE/examples/iBeacon/ci.yml
new file mode 100644
index 00000000000..cfee8c8935f
--- /dev/null
+++ b/libraries/BLE/examples/iBeacon/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
diff --git a/libraries/BluetoothSerial/examples/DiscoverConnect/ci.json b/libraries/BluetoothSerial/examples/DiscoverConnect/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/DiscoverConnect/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/DiscoverConnect/ci.yml b/libraries/BluetoothSerial/examples/DiscoverConnect/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/DiscoverConnect/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/BluetoothSerial/examples/GetLocalMAC/ci.json b/libraries/BluetoothSerial/examples/GetLocalMAC/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/GetLocalMAC/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/GetLocalMAC/ci.yml b/libraries/BluetoothSerial/examples/GetLocalMAC/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/GetLocalMAC/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.yml b/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBT/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.yml b/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBTM/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.yml b/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.json b/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.yml b/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.json b/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.yml b/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/bt_classic_device_discovery/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.json b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.json
deleted file mode 100644
index b5097688f52..00000000000
--- a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_BT_SPP_ENABLED=y"
-  ]
-}
diff --git a/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.yml b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.yml
new file mode 100644
index 00000000000..335e5be5b76
--- /dev/null
+++ b/libraries/BluetoothSerial/examples/bt_remove_paired_devices/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_BT_SPP_ENABLED=y
diff --git a/libraries/DNSServer/examples/CaptivePortal/ci.json b/libraries/DNSServer/examples/CaptivePortal/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/DNSServer/examples/CaptivePortal/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/DNSServer/examples/CaptivePortal/ci.yml b/libraries/DNSServer/examples/CaptivePortal/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/DNSServer/examples/CaptivePortal/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.json b/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.json
deleted file mode 100644
index a9d8603b7bf..00000000000
--- a/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.yml b/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.yml
new file mode 100644
index 00000000000..b001ab0f4a3
--- /dev/null
+++ b/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED=y
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/ci.json b/libraries/ESP32/examples/Camera/CameraWebServer/ci.json
deleted file mode 100644
index 35c3056dda8..00000000000
--- a/libraries/ESP32/examples/Camera/CameraWebServer/ci.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "fqbn": {
-    "esp32": [
-      "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=custom,FlashMode=dio",
-      "espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=custom,FlashMode=dio"
-    ],
-    "esp32s2": [
-      "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=custom,FlashMode=dio",
-      "espressif:esp32:esp32s2:PSRAM=disabled,PartitionScheme=custom,FlashMode=dio"
-    ],
-    "esp32s3": [
-      "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=custom,FlashMode=qio",
-      "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=custom,FlashMode=qio",
-      "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=custom,FlashMode=qio"
-    ]
-  },
-  "requires": [
-    "CONFIG_CAMERA_TASK_STACK_SIZE=[0-9]+"
-  ]
-}
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/ci.yml b/libraries/ESP32/examples/Camera/CameraWebServer/ci.yml
new file mode 100644
index 00000000000..aea91ac431c
--- /dev/null
+++ b/libraries/ESP32/examples/Camera/CameraWebServer/ci.yml
@@ -0,0 +1,14 @@
+fqbn:
+  esp32:
+    - espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=custom,FlashMode=dio
+    - espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=custom,FlashMode=dio
+  esp32s2:
+    - espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=custom,FlashMode=dio
+    - espressif:esp32:esp32s2:PSRAM=disabled,PartitionScheme=custom,FlashMode=dio
+  esp32s3:
+    - espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=custom,FlashMode=qio
+    - espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=custom,FlashMode=qio
+    - espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=custom,FlashMode=qio
+
+requires:
+  - CONFIG_CAMERA_TASK_STACK_SIZE=[0-9]+
diff --git a/libraries/ESP32/examples/DeepSleep/ExternalWakeUp/ci.json b/libraries/ESP32/examples/DeepSleep/ExternalWakeUp/ci.json
deleted file mode 100644
index dfd49d94fe9..00000000000
--- a/libraries/ESP32/examples/DeepSleep/ExternalWakeUp/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32p4": false,
-    "esp32c5": false
-  }
-}
diff --git a/libraries/ESP32/examples/DeepSleep/ExternalWakeUp/ci.yml b/libraries/ESP32/examples/DeepSleep/ExternalWakeUp/ci.yml
new file mode 100644
index 00000000000..f0c2d6e9fe2
--- /dev/null
+++ b/libraries/ESP32/examples/DeepSleep/ExternalWakeUp/ci.yml
@@ -0,0 +1,6 @@
+targets:
+  esp32c3: false
+  esp32c6: false
+  esp32h2: false
+  esp32p4: false
+  esp32c5: false
diff --git a/libraries/ESP32/examples/DeepSleep/SmoothBlink_ULP_Code/ci.json b/libraries/ESP32/examples/DeepSleep/SmoothBlink_ULP_Code/ci.json
deleted file mode 100644
index 5fa2bd14e5d..00000000000
--- a/libraries/ESP32/examples/DeepSleep/SmoothBlink_ULP_Code/ci.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32p4": false,
-    "esp32s2": false,
-    "esp32s3": false,
-    "esp32c5": false
-  }
-}
diff --git a/libraries/ESP32/examples/DeepSleep/SmoothBlink_ULP_Code/ci.yml b/libraries/ESP32/examples/DeepSleep/SmoothBlink_ULP_Code/ci.yml
new file mode 100644
index 00000000000..556ac03be4c
--- /dev/null
+++ b/libraries/ESP32/examples/DeepSleep/SmoothBlink_ULP_Code/ci.yml
@@ -0,0 +1,8 @@
+targets:
+  esp32c3: false
+  esp32c6: false
+  esp32h2: false
+  esp32p4: false
+  esp32s2: false
+  esp32s3: false
+  esp32c5: false
diff --git a/libraries/ESP32/examples/DeepSleep/TimerWakeUp/ci.json b/libraries/ESP32/examples/DeepSleep/TimerWakeUp/ci.json
deleted file mode 100644
index d8b3664bc65..00000000000
--- a/libraries/ESP32/examples/DeepSleep/TimerWakeUp/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "targets": {
-    "esp32h2": false
-  }
-}
diff --git a/libraries/ESP32/examples/DeepSleep/TimerWakeUp/ci.yml b/libraries/ESP32/examples/DeepSleep/TimerWakeUp/ci.yml
new file mode 100644
index 00000000000..f2c7072e1c2
--- /dev/null
+++ b/libraries/ESP32/examples/DeepSleep/TimerWakeUp/ci.yml
@@ -0,0 +1,2 @@
+targets:
+  esp32h2: false
diff --git a/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.json b/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.json
deleted file mode 100644
index ae65fa0df74..00000000000
--- a/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "targets": {
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32c5": false
-  }
-}
diff --git a/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.yml b/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.yml
new file mode 100644
index 00000000000..dc765ea8326
--- /dev/null
+++ b/libraries/ESP32/examples/DeepSleep/TouchWakeUp/ci.yml
@@ -0,0 +1,5 @@
+targets:
+  esp32c3: false
+  esp32c6: false
+  esp32h2: false
+  esp32c5: false
diff --git a/libraries/ESP32/examples/HWCDC_Events/ci.json b/libraries/ESP32/examples/HWCDC_Events/ci.json
deleted file mode 100644
index 56e38bbcdf2..00000000000
--- a/libraries/ESP32/examples/HWCDC_Events/ci.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "fqbn": {
-    "esp32s3": [
-      "espressif:esp32:esp32s3:USBMode=hwcdc,PartitionScheme=huge_app,FlashMode=dio"
-    ]
-  },
-  "requires": [
-    "CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP32/examples/HWCDC_Events/ci.yml b/libraries/ESP32/examples/HWCDC_Events/ci.yml
new file mode 100644
index 00000000000..6561aa854a2
--- /dev/null
+++ b/libraries/ESP32/examples/HWCDC_Events/ci.yml
@@ -0,0 +1,6 @@
+fqbn:
+  esp32s3:
+    - espressif:esp32:esp32s3:USBMode=hwcdc,PartitionScheme=huge_app,FlashMode=dio
+
+requires:
+  - CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED=y
diff --git a/libraries/ESP32/examples/TWAI/TWAIreceive/ci.json b/libraries/ESP32/examples/TWAI/TWAIreceive/ci.json
deleted file mode 100644
index 7379dba8bb9..00000000000
--- a/libraries/ESP32/examples/TWAI/TWAIreceive/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "targets": {
-    "esp32c5": false
-  }
-}
diff --git a/libraries/ESP32/examples/TWAI/TWAIreceive/ci.yml b/libraries/ESP32/examples/TWAI/TWAIreceive/ci.yml
new file mode 100644
index 00000000000..655244ef541
--- /dev/null
+++ b/libraries/ESP32/examples/TWAI/TWAIreceive/ci.yml
@@ -0,0 +1,2 @@
+targets:
+  esp32c5: false
diff --git a/libraries/ESP32/examples/TWAI/TWAItransmit/ci.json b/libraries/ESP32/examples/TWAI/TWAItransmit/ci.json
deleted file mode 100644
index 7379dba8bb9..00000000000
--- a/libraries/ESP32/examples/TWAI/TWAItransmit/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "targets": {
-    "esp32c5": false
-  }
-}
diff --git a/libraries/ESP32/examples/TWAI/TWAItransmit/ci.yml b/libraries/ESP32/examples/TWAI/TWAItransmit/ci.yml
new file mode 100644
index 00000000000..655244ef541
--- /dev/null
+++ b/libraries/ESP32/examples/TWAI/TWAItransmit/ci.yml
@@ -0,0 +1,2 @@
+targets:
+  esp32c5: false
diff --git a/libraries/ESP32/examples/Time/SimpleTime/ci.json b/libraries/ESP32/examples/Time/SimpleTime/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/ESP32/examples/Time/SimpleTime/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/ESP32/examples/Time/SimpleTime/ci.yml b/libraries/ESP32/examples/Time/SimpleTime/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/ESP32/examples/Time/SimpleTime/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/ESP32/examples/Touch/TouchButton/ci.json b/libraries/ESP32/examples/Touch/TouchButton/ci.json
deleted file mode 100644
index c0ecf9fc0a5..00000000000
--- a/libraries/ESP32/examples/Touch/TouchButton/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP32/examples/Touch/TouchButton/ci.yml b/libraries/ESP32/examples/Touch/TouchButton/ci.yml
new file mode 100644
index 00000000000..feaef91cf65
--- /dev/null
+++ b/libraries/ESP32/examples/Touch/TouchButton/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
diff --git a/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json b/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json
deleted file mode 100644
index c0ecf9fc0a5..00000000000
--- a/libraries/ESP32/examples/Touch/TouchInterrupt/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP32/examples/Touch/TouchInterrupt/ci.yml b/libraries/ESP32/examples/Touch/TouchInterrupt/ci.yml
new file mode 100644
index 00000000000..feaef91cf65
--- /dev/null
+++ b/libraries/ESP32/examples/Touch/TouchInterrupt/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
diff --git a/libraries/ESP32/examples/Touch/TouchRead/ci.json b/libraries/ESP32/examples/Touch/TouchRead/ci.json
deleted file mode 100644
index c0ecf9fc0a5..00000000000
--- a/libraries/ESP32/examples/Touch/TouchRead/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP32/examples/Touch/TouchRead/ci.yml b/libraries/ESP32/examples/Touch/TouchRead/ci.yml
new file mode 100644
index 00000000000..feaef91cf65
--- /dev/null
+++ b/libraries/ESP32/examples/Touch/TouchRead/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
diff --git a/libraries/ESP_I2S/examples/ES8388_loopback/ci.json b/libraries/ESP_I2S/examples/ES8388_loopback/ci.json
deleted file mode 100644
index e0f64e28943..00000000000
--- a/libraries/ESP_I2S/examples/ES8388_loopback/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_I2S_SUPPORTED=y",
-    "CONFIG_SOC_I2C_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP_I2S/examples/ES8388_loopback/ci.yml b/libraries/ESP_I2S/examples/ES8388_loopback/ci.yml
new file mode 100644
index 00000000000..1deb186296b
--- /dev/null
+++ b/libraries/ESP_I2S/examples/ES8388_loopback/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_SOC_I2S_SUPPORTED=y
+  - CONFIG_SOC_I2C_SUPPORTED=y
diff --git a/libraries/ESP_I2S/examples/Record_to_WAV/ci.json b/libraries/ESP_I2S/examples/Record_to_WAV/ci.json
deleted file mode 100644
index a45dc2f0120..00000000000
--- a/libraries/ESP_I2S/examples/Record_to_WAV/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y",
-    "CONFIG_SOC_I2S_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP_I2S/examples/Record_to_WAV/ci.yml b/libraries/ESP_I2S/examples/Record_to_WAV/ci.yml
new file mode 100644
index 00000000000..7ab2c964b4b
--- /dev/null
+++ b/libraries/ESP_I2S/examples/Record_to_WAV/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
+  - CONFIG_SOC_I2S_SUPPORTED=y
diff --git a/libraries/ESP_I2S/examples/Simple_tone/ci.json b/libraries/ESP_I2S/examples/Simple_tone/ci.json
deleted file mode 100644
index 9842f2f9b2a..00000000000
--- a/libraries/ESP_I2S/examples/Simple_tone/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_I2S_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP_I2S/examples/Simple_tone/ci.yml b/libraries/ESP_I2S/examples/Simple_tone/ci.yml
new file mode 100644
index 00000000000..5107c290753
--- /dev/null
+++ b/libraries/ESP_I2S/examples/Simple_tone/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_I2S_SUPPORTED=y
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.yml b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Master/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.yml b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Broadcast_Slave/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.yml b/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Network/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json b/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.yml b/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/ESP_NOW/examples/ESP_NOW_Serial/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/ESP_SR/examples/Basic/ci.json b/libraries/ESP_SR/examples/Basic/ci.json
deleted file mode 100644
index ed7699a7857..00000000000
--- a/libraries/ESP_SR/examples/Basic/ci.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "fqbn": {
-    "esp32s3": [
-      "espressif:esp32:esp32s3:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=dio"
-    ],
-    "esp32p4": [
-      "espressif:esp32:esp32p4:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=qio"
-    ]
-  },
-  "requires": [
-    "CONFIG_SOC_I2S_SUPPORTED=y"
-  ],
-  "targets": {
-    "esp32": false,
-    "esp32c3": false,
-    "esp32c6": false,
-    "esp32h2": false,
-    "esp32s2": false,
-    "esp32c5": false
-  }
-}
diff --git a/libraries/ESP_SR/examples/Basic/ci.yml b/libraries/ESP_SR/examples/Basic/ci.yml
new file mode 100644
index 00000000000..cdd66d7ce39
--- /dev/null
+++ b/libraries/ESP_SR/examples/Basic/ci.yml
@@ -0,0 +1,16 @@
+fqbn:
+  esp32s3:
+    - espressif:esp32:esp32s3:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=dio
+  esp32p4:
+    - espressif:esp32:esp32p4:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=qio
+
+requires:
+  - CONFIG_SOC_I2S_SUPPORTED=y
+
+targets:
+  esp32: false
+  esp32c3: false
+  esp32c6: false
+  esp32h2: false
+  esp32s2: false
+  esp32c5: false
diff --git a/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json b/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.yml b/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/ESPmDNS/examples/mDNS-SD_Extended/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json b/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.yml b/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/ESPmDNS/examples/mDNS_Web_Server/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Ethernet/examples/ETH_LAN8720/ci.json b/libraries/Ethernet/examples/ETH_LAN8720/ci.json
deleted file mode 100644
index 0eab13b8841..00000000000
--- a/libraries/Ethernet/examples/ETH_LAN8720/ci.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "requires": [
-    "CONFIG_ETH_USE_ESP32_EMAC=y"
-  ],
-  "targets": {
-    "esp32p4": false
-  }
-}
diff --git a/libraries/Ethernet/examples/ETH_LAN8720/ci.yml b/libraries/Ethernet/examples/ETH_LAN8720/ci.yml
new file mode 100644
index 00000000000..87dccc48269
--- /dev/null
+++ b/libraries/Ethernet/examples/ETH_LAN8720/ci.yml
@@ -0,0 +1,5 @@
+requires:
+  - CONFIG_ETH_USE_ESP32_EMAC=y
+
+targets:
+  esp32p4: false
diff --git a/libraries/Ethernet/examples/ETH_TLK110/ci.json b/libraries/Ethernet/examples/ETH_TLK110/ci.json
deleted file mode 100644
index dcdfd06db51..00000000000
--- a/libraries/Ethernet/examples/ETH_TLK110/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_ETH_USE_ESP32_EMAC=y"
-  ]
-}
diff --git a/libraries/Ethernet/examples/ETH_TLK110/ci.yml b/libraries/Ethernet/examples/ETH_TLK110/ci.yml
new file mode 100644
index 00000000000..1c051776e19
--- /dev/null
+++ b/libraries/Ethernet/examples/ETH_TLK110/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_ETH_USE_ESP32_EMAC=y
diff --git a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.yml b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/Ethernet/examples/ETH_WIFI_BRIDGE/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/FFat/examples/FFat_time/ci.json b/libraries/FFat/examples/FFat_time/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/FFat/examples/FFat_time/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/FFat/examples/FFat_time/ci.yml b/libraries/FFat/examples/FFat_time/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/FFat/examples/FFat_time/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPClient/examples/Authorization/ci.json b/libraries/HTTPClient/examples/Authorization/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPClient/examples/Authorization/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPClient/examples/Authorization/ci.yml b/libraries/HTTPClient/examples/Authorization/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPClient/examples/Authorization/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPClient/examples/BasicHttpClient/ci.json b/libraries/HTTPClient/examples/BasicHttpClient/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPClient/examples/BasicHttpClient/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPClient/examples/BasicHttpClient/ci.yml b/libraries/HTTPClient/examples/BasicHttpClient/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPClient/examples/BasicHttpClient/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPClient/examples/BasicHttpsClient/ci.json b/libraries/HTTPClient/examples/BasicHttpsClient/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPClient/examples/BasicHttpsClient/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPClient/examples/BasicHttpsClient/ci.yml b/libraries/HTTPClient/examples/BasicHttpsClient/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPClient/examples/BasicHttpsClient/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPClient/examples/CustomHeaders/ci.json b/libraries/HTTPClient/examples/CustomHeaders/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPClient/examples/CustomHeaders/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPClient/examples/CustomHeaders/ci.yml b/libraries/HTTPClient/examples/CustomHeaders/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPClient/examples/CustomHeaders/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json b/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json
deleted file mode 100644
index 04eb62b977a..00000000000
--- a/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.yml b/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.yml
new file mode 100644
index 00000000000..e412162e577
--- /dev/null
+++ b/libraries/HTTPClient/examples/HTTPClientEnterprise/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/HTTPClient/examples/ReuseConnection/ci.json b/libraries/HTTPClient/examples/ReuseConnection/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPClient/examples/ReuseConnection/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPClient/examples/ReuseConnection/ci.yml b/libraries/HTTPClient/examples/ReuseConnection/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPClient/examples/ReuseConnection/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPClient/examples/StreamHttpClient/ci.json b/libraries/HTTPClient/examples/StreamHttpClient/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPClient/examples/StreamHttpClient/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPClient/examples/StreamHttpClient/ci.yml b/libraries/HTTPClient/examples/StreamHttpClient/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPClient/examples/StreamHttpClient/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPUpdate/examples/httpUpdate/ci.json b/libraries/HTTPUpdate/examples/httpUpdate/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPUpdate/examples/httpUpdate/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPUpdate/examples/httpUpdate/ci.yml b/libraries/HTTPUpdate/examples/httpUpdate/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPUpdate/examples/httpUpdate/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.json b/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.yml b/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPUpdate/examples/httpUpdateSPIFFS/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.json b/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.json
deleted file mode 100644
index cbdd28f773d..00000000000
--- a/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.yml b/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.yml
new file mode 100644
index 00000000000..9f15b3468e6
--- /dev/null
+++ b/libraries/HTTPUpdate/examples/httpUpdateSecure/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/HTTPUpdateServer/examples/WebUpdater/ci.json b/libraries/HTTPUpdateServer/examples/WebUpdater/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/HTTPUpdateServer/examples/WebUpdater/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/HTTPUpdateServer/examples/WebUpdater/ci.yml b/libraries/HTTPUpdateServer/examples/WebUpdater/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/HTTPUpdateServer/examples/WebUpdater/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Insights/examples/DiagnosticsSmokeTest/ci.json b/libraries/Insights/examples/DiagnosticsSmokeTest/ci.json
deleted file mode 100644
index cbd69d50029..00000000000
--- a/libraries/Insights/examples/DiagnosticsSmokeTest/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requires": [
-    "CONFIG_ESP_INSIGHTS_ENABLED=y"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Insights/examples/DiagnosticsSmokeTest/ci.yml b/libraries/Insights/examples/DiagnosticsSmokeTest/ci.yml
new file mode 100644
index 00000000000..427f0f5ff51
--- /dev/null
+++ b/libraries/Insights/examples/DiagnosticsSmokeTest/ci.yml
@@ -0,0 +1,6 @@
+requires:
+  - CONFIG_ESP_INSIGHTS_ENABLED=y
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Insights/examples/MinimalDiagnostics/ci.json b/libraries/Insights/examples/MinimalDiagnostics/ci.json
deleted file mode 100644
index cbd69d50029..00000000000
--- a/libraries/Insights/examples/MinimalDiagnostics/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requires": [
-    "CONFIG_ESP_INSIGHTS_ENABLED=y"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Insights/examples/MinimalDiagnostics/ci.yml b/libraries/Insights/examples/MinimalDiagnostics/ci.yml
new file mode 100644
index 00000000000..427f0f5ff51
--- /dev/null
+++ b/libraries/Insights/examples/MinimalDiagnostics/ci.yml
@@ -0,0 +1,6 @@
+requires:
+  - CONFIG_ESP_INSIGHTS_ENABLED=y
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/LittleFS/examples/LITTLEFS_time/ci.json b/libraries/LittleFS/examples/LITTLEFS_time/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/LittleFS/examples/LITTLEFS_time/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/LittleFS/examples/LITTLEFS_time/ci.yml b/libraries/LittleFS/examples/LITTLEFS_time/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/LittleFS/examples/LITTLEFS_time/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Matter/examples/MatterColorLight/ci.json b/libraries/Matter/examples/MatterColorLight/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterColorLight/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterColorLight/ci.yml b/libraries/Matter/examples/MatterColorLight/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterColorLight/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterCommissionTest/ci.json b/libraries/Matter/examples/MatterCommissionTest/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterCommissionTest/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterCommissionTest/ci.yml b/libraries/Matter/examples/MatterCommissionTest/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterCommissionTest/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterComposedLights/ci.json b/libraries/Matter/examples/MatterComposedLights/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterComposedLights/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterComposedLights/ci.yml b/libraries/Matter/examples/MatterComposedLights/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterComposedLights/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterContactSensor/ci.json b/libraries/Matter/examples/MatterContactSensor/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterContactSensor/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterContactSensor/ci.yml b/libraries/Matter/examples/MatterContactSensor/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterContactSensor/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterDimmableLight/ci.json b/libraries/Matter/examples/MatterDimmableLight/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterDimmableLight/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterDimmableLight/ci.yml b/libraries/Matter/examples/MatterDimmableLight/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterDimmableLight/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterEnhancedColorLight/ci.json b/libraries/Matter/examples/MatterEnhancedColorLight/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterEnhancedColorLight/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterEnhancedColorLight/ci.yml b/libraries/Matter/examples/MatterEnhancedColorLight/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterEnhancedColorLight/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterEvents/ci.json b/libraries/Matter/examples/MatterEvents/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterEvents/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterEvents/ci.yml b/libraries/Matter/examples/MatterEvents/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterEvents/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterFan/ci.json b/libraries/Matter/examples/MatterFan/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterFan/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterFan/ci.yml b/libraries/Matter/examples/MatterFan/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterFan/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterHumiditySensor/ci.json b/libraries/Matter/examples/MatterHumiditySensor/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterHumiditySensor/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterHumiditySensor/ci.yml b/libraries/Matter/examples/MatterHumiditySensor/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterHumiditySensor/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterLambdaSingleCallbackManyEPs/ci.json b/libraries/Matter/examples/MatterLambdaSingleCallbackManyEPs/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterLambdaSingleCallbackManyEPs/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterLambdaSingleCallbackManyEPs/ci.yml b/libraries/Matter/examples/MatterLambdaSingleCallbackManyEPs/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterLambdaSingleCallbackManyEPs/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterMinimum/ci.json b/libraries/Matter/examples/MatterMinimum/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterMinimum/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterMinimum/ci.yml b/libraries/Matter/examples/MatterMinimum/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterMinimum/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterOccupancySensor/ci.json b/libraries/Matter/examples/MatterOccupancySensor/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterOccupancySensor/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterOccupancySensor/ci.yml b/libraries/Matter/examples/MatterOccupancySensor/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterOccupancySensor/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterOnIdentify/ci.json b/libraries/Matter/examples/MatterOnIdentify/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterOnIdentify/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterOnIdentify/ci.yml b/libraries/Matter/examples/MatterOnIdentify/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterOnIdentify/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterOnOffLight/ci.json b/libraries/Matter/examples/MatterOnOffLight/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterOnOffLight/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterOnOffLight/ci.yml b/libraries/Matter/examples/MatterOnOffLight/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterOnOffLight/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterOnOffPlugin/ci.json b/libraries/Matter/examples/MatterOnOffPlugin/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterOnOffPlugin/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterOnOffPlugin/ci.yml b/libraries/Matter/examples/MatterOnOffPlugin/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterOnOffPlugin/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterPressureSensor/ci.json b/libraries/Matter/examples/MatterPressureSensor/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterPressureSensor/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterPressureSensor/ci.yml b/libraries/Matter/examples/MatterPressureSensor/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterPressureSensor/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterSmartButon/ci.json b/libraries/Matter/examples/MatterSmartButon/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterSmartButon/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterSmartButon/ci.yml b/libraries/Matter/examples/MatterSmartButon/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterSmartButon/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterTemperatureLight/ci.json b/libraries/Matter/examples/MatterTemperatureLight/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterTemperatureLight/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterTemperatureLight/ci.yml b/libraries/Matter/examples/MatterTemperatureLight/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterTemperatureLight/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterTemperatureSensor/ci.json b/libraries/Matter/examples/MatterTemperatureSensor/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterTemperatureSensor/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterTemperatureSensor/ci.yml b/libraries/Matter/examples/MatterTemperatureSensor/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterTemperatureSensor/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/Matter/examples/MatterThermostat/ci.json b/libraries/Matter/examples/MatterThermostat/ci.json
deleted file mode 100644
index 90b393f9156..00000000000
--- a/libraries/Matter/examples/MatterThermostat/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y"
-  ]
-}
diff --git a/libraries/Matter/examples/MatterThermostat/ci.yml b/libraries/Matter/examples/MatterThermostat/ci.yml
new file mode 100644
index 00000000000..050a80ff543
--- /dev/null
+++ b/libraries/Matter/examples/MatterThermostat/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y
diff --git a/libraries/NetBIOS/examples/ESP_NBNST/ci.json b/libraries/NetBIOS/examples/ESP_NBNST/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/NetBIOS/examples/ESP_NBNST/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/NetBIOS/examples/ESP_NBNST/ci.yml b/libraries/NetBIOS/examples/ESP_NBNST/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/NetBIOS/examples/ESP_NBNST/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.yml b/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/NetworkClientSecure/examples/WiFiClientInsecure/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.yml b/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/NetworkClientSecure/examples/WiFiClientPSK/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.json
deleted file mode 100644
index cbdd28f773d..00000000000
--- a/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.yml b/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.yml
new file mode 100644
index 00000000000..9f15b3468e6
--- /dev/null
+++ b/libraries/NetworkClientSecure/examples/WiFiClientSecure/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json
deleted file mode 100644
index 04eb62b977a..00000000000
--- a/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.yml b/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.yml
new file mode 100644
index 00000000000..e412162e577
--- /dev/null
+++ b/libraries/NetworkClientSecure/examples/WiFiClientSecureEnterprise/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.yml b/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/NetworkClientSecure/examples/WiFiClientSecureProtocolUpgrade/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.yml b/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/NetworkClientSecure/examples/WiFiClientShowPeerCredentials/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.json b/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.yml b/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/NetworkClientSecure/examples/WiFiClientTrustOnFirstUse/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.json b/libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.yml b/libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.json b/libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.yml b/libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/SimpleCLI/ci.json b/libraries/OpenThread/examples/CLI/SimpleCLI/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/SimpleCLI/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/SimpleCLI/ci.yml b/libraries/OpenThread/examples/CLI/SimpleCLI/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/SimpleCLI/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/SimpleNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleNode/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/SimpleNode/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/SimpleNode/ci.yml b/libraries/OpenThread/examples/CLI/SimpleNode/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/SimpleNode/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.yml b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.yml b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.yml b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/ThreadScan/ci.json b/libraries/OpenThread/examples/CLI/ThreadScan/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/ThreadScan/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/ThreadScan/ci.yml b/libraries/OpenThread/examples/CLI/ThreadScan/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/ThreadScan/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/CLI/onReceive/ci.json b/libraries/OpenThread/examples/CLI/onReceive/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/CLI/onReceive/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/CLI/onReceive/ci.yml b/libraries/OpenThread/examples/CLI/onReceive/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/CLI/onReceive/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.json b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.yml b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.json b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.json
deleted file mode 100644
index 2ee6af3490e..00000000000
--- a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_OPENTHREAD_ENABLED=y",
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.yml b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.yml
new file mode 100644
index 00000000000..452905cdc41
--- /dev/null
+++ b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_OPENTHREAD_ENABLED=y
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
diff --git a/libraries/PPP/examples/PPP_Basic/ci.json b/libraries/PPP/examples/PPP_Basic/ci.json
deleted file mode 100644
index 314587edcf6..00000000000
--- a/libraries/PPP/examples/PPP_Basic/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_LWIP_PPP_SUPPORT=y"
-  ]
-}
diff --git a/libraries/PPP/examples/PPP_Basic/ci.yml b/libraries/PPP/examples/PPP_Basic/ci.yml
new file mode 100644
index 00000000000..857734a4d75
--- /dev/null
+++ b/libraries/PPP/examples/PPP_Basic/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_LWIP_PPP_SUPPORT=y
diff --git a/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json b/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json
deleted file mode 100644
index ccc62161c85..00000000000
--- a/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requires": [
-    "CONFIG_LWIP_PPP_SUPPORT=y"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.yml b/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.yml
new file mode 100644
index 00000000000..2e80e1b43ca
--- /dev/null
+++ b/libraries/PPP/examples/PPP_WIFI_BRIDGE/ci.yml
@@ -0,0 +1,6 @@
+requires:
+  - CONFIG_LWIP_PPP_SUPPORT=y
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/RainMaker/examples/RMakerCustom/ci.json b/libraries/RainMaker/examples/RMakerCustom/ci.json
deleted file mode 100644
index ce63fe9ccf0..00000000000
--- a/libraries/RainMaker/examples/RMakerCustom/ci.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "targets": {
-    "esp32": false
-  },
-  "fqbn_append": "PartitionScheme=rainmaker_4MB",
-  "requires": [
-    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/RainMaker/examples/RMakerCustom/ci.yml b/libraries/RainMaker/examples/RMakerCustom/ci.yml
new file mode 100644
index 00000000000..fc2a11e6948
--- /dev/null
+++ b/libraries/RainMaker/examples/RMakerCustom/ci.yml
@@ -0,0 +1,11 @@
+targets:
+  esp32: false
+
+fqbn_append: PartitionScheme=rainmaker_4MB
+
+requires:
+  - CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json b/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json
deleted file mode 100644
index ce63fe9ccf0..00000000000
--- a/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "targets": {
-    "esp32": false
-  },
-  "fqbn_append": "PartitionScheme=rainmaker_4MB",
-  "requires": [
-    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.yml b/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.yml
new file mode 100644
index 00000000000..fc2a11e6948
--- /dev/null
+++ b/libraries/RainMaker/examples/RMakerCustomAirCooler/ci.yml
@@ -0,0 +1,11 @@
+targets:
+  esp32: false
+
+fqbn_append: PartitionScheme=rainmaker_4MB
+
+requires:
+  - CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json b/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json
deleted file mode 100644
index ce63fe9ccf0..00000000000
--- a/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "targets": {
-    "esp32": false
-  },
-  "fqbn_append": "PartitionScheme=rainmaker_4MB",
-  "requires": [
-    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.yml b/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.yml
new file mode 100644
index 00000000000..fc2a11e6948
--- /dev/null
+++ b/libraries/RainMaker/examples/RMakerSonoffDualR3/ci.yml
@@ -0,0 +1,11 @@
+targets:
+  esp32: false
+
+fqbn_append: PartitionScheme=rainmaker_4MB
+
+requires:
+  - CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/RainMaker/examples/RMakerSwitch/ci.json b/libraries/RainMaker/examples/RMakerSwitch/ci.json
deleted file mode 100644
index ce63fe9ccf0..00000000000
--- a/libraries/RainMaker/examples/RMakerSwitch/ci.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "targets": {
-    "esp32": false
-  },
-  "fqbn_append": "PartitionScheme=rainmaker_4MB",
-  "requires": [
-    "CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/RainMaker/examples/RMakerSwitch/ci.yml b/libraries/RainMaker/examples/RMakerSwitch/ci.yml
new file mode 100644
index 00000000000..fc2a11e6948
--- /dev/null
+++ b/libraries/RainMaker/examples/RMakerSwitch/ci.yml
@@ -0,0 +1,11 @@
+targets:
+  esp32: false
+
+fqbn_append: PartitionScheme=rainmaker_4MB
+
+requires:
+  - CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK=[1-9][0-9]*
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/SD/examples/SD_time/ci.json b/libraries/SD/examples/SD_time/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/SD/examples/SD_time/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/SD/examples/SD_time/ci.yml b/libraries/SD/examples/SD_time/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/SD/examples/SD_time/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/SD_MMC/examples/SD2USBMSC/ci.json b/libraries/SD_MMC/examples/SD2USBMSC/ci.json
deleted file mode 100644
index 125eed2e476..00000000000
--- a/libraries/SD_MMC/examples/SD2USBMSC/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y",
-    "CONFIG_TINYUSB_MSC_ENABLED=y"
-  ]
-}
diff --git a/libraries/SD_MMC/examples/SD2USBMSC/ci.yml b/libraries/SD_MMC/examples/SD2USBMSC/ci.yml
new file mode 100644
index 00000000000..e2806a2b62c
--- /dev/null
+++ b/libraries/SD_MMC/examples/SD2USBMSC/ci.yml
@@ -0,0 +1,3 @@
+requires:
+  - CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
+  - CONFIG_TINYUSB_MSC_ENABLED=y
diff --git a/libraries/SD_MMC/examples/SDMMC_Test/ci.json b/libraries/SD_MMC/examples/SDMMC_Test/ci.json
deleted file mode 100644
index a5221dae538..00000000000
--- a/libraries/SD_MMC/examples/SDMMC_Test/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/SD_MMC/examples/SDMMC_Test/ci.yml b/libraries/SD_MMC/examples/SDMMC_Test/ci.yml
new file mode 100644
index 00000000000..f519ee565aa
--- /dev/null
+++ b/libraries/SD_MMC/examples/SDMMC_Test/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
diff --git a/libraries/SD_MMC/examples/SDMMC_time/ci.json b/libraries/SD_MMC/examples/SDMMC_time/ci.json
deleted file mode 100644
index 5552b63d32a..00000000000
--- a/libraries/SD_MMC/examples/SDMMC_time/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_SDMMC_HOST_SUPPORTED=y"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/SD_MMC/examples/SDMMC_time/ci.yml b/libraries/SD_MMC/examples/SDMMC_time/ci.yml
new file mode 100644
index 00000000000..a6c887da173
--- /dev/null
+++ b/libraries/SD_MMC/examples/SDMMC_time/ci.yml
@@ -0,0 +1,6 @@
+requires:
+  - CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/SPI/examples/SPI_Multiple_Buses/ci.json b/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
deleted file mode 100644
index cd27a02724b..00000000000
--- a/libraries/SPI/examples/SPI_Multiple_Buses/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_SPI_PERIPH_NUM=[2-9]"
-  ]
-}
diff --git a/libraries/SPI/examples/SPI_Multiple_Buses/ci.yml b/libraries/SPI/examples/SPI_Multiple_Buses/ci.yml
new file mode 100644
index 00000000000..91f0a17f1c0
--- /dev/null
+++ b/libraries/SPI/examples/SPI_Multiple_Buses/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_SPI_PERIPH_NUM=[2-9]
diff --git a/libraries/SPIFFS/examples/SPIFFS_time/ci.json b/libraries/SPIFFS/examples/SPIFFS_time/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/SPIFFS/examples/SPIFFS_time/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/SPIFFS/examples/SPIFFS_time/ci.yml b/libraries/SPIFFS/examples/SPIFFS_time/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/SPIFFS/examples/SPIFFS_time/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/SimpleBLE/examples/SimpleBleDevice/ci.json b/libraries/SimpleBLE/examples/SimpleBleDevice/ci.json
deleted file mode 100644
index 3b6a150b31a..00000000000
--- a/libraries/SimpleBLE/examples/SimpleBleDevice/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_BLE_SUPPORTED=y",
-    "CONFIG_BT_ENABLED=y",
-    "CONFIG_BLUEDROID_ENABLED=y"
-  ]
-}
diff --git a/libraries/SimpleBLE/examples/SimpleBleDevice/ci.yml b/libraries/SimpleBLE/examples/SimpleBleDevice/ci.yml
new file mode 100644
index 00000000000..87d5a470cd1
--- /dev/null
+++ b/libraries/SimpleBLE/examples/SimpleBleDevice/ci.yml
@@ -0,0 +1,4 @@
+requires:
+  - CONFIG_SOC_BLE_SUPPORTED=y
+  - CONFIG_BT_ENABLED=y
+  - CONFIG_BLUEDROID_ENABLED=y
diff --git a/libraries/USB/examples/CompositeDevice/ci.json b/libraries/USB/examples/CompositeDevice/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/CompositeDevice/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/CompositeDevice/ci.yml b/libraries/USB/examples/CompositeDevice/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/CompositeDevice/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/ConsumerControl/ci.json b/libraries/USB/examples/ConsumerControl/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/ConsumerControl/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/ConsumerControl/ci.yml b/libraries/USB/examples/ConsumerControl/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/ConsumerControl/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/CustomHIDDevice/ci.json b/libraries/USB/examples/CustomHIDDevice/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/CustomHIDDevice/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/CustomHIDDevice/ci.yml b/libraries/USB/examples/CustomHIDDevice/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/CustomHIDDevice/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/FirmwareMSC/ci.json b/libraries/USB/examples/FirmwareMSC/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/FirmwareMSC/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/FirmwareMSC/ci.yml b/libraries/USB/examples/FirmwareMSC/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/FirmwareMSC/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/Gamepad/ci.json b/libraries/USB/examples/Gamepad/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/Gamepad/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/Gamepad/ci.yml b/libraries/USB/examples/Gamepad/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/Gamepad/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/HIDVendor/ci.json b/libraries/USB/examples/HIDVendor/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/HIDVendor/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/HIDVendor/ci.yml b/libraries/USB/examples/HIDVendor/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/HIDVendor/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/Keyboard/KeyboardLogout/ci.json b/libraries/USB/examples/Keyboard/KeyboardLogout/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/Keyboard/KeyboardLogout/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/Keyboard/KeyboardLogout/ci.yml b/libraries/USB/examples/Keyboard/KeyboardLogout/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/Keyboard/KeyboardLogout/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/Keyboard/KeyboardMessage/ci.json b/libraries/USB/examples/Keyboard/KeyboardMessage/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/Keyboard/KeyboardMessage/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/Keyboard/KeyboardMessage/ci.yml b/libraries/USB/examples/Keyboard/KeyboardMessage/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/Keyboard/KeyboardMessage/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.json b/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.yml b/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/Keyboard/KeyboardReprogram/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/Keyboard/KeyboardSerial/ci.json b/libraries/USB/examples/Keyboard/KeyboardSerial/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/Keyboard/KeyboardSerial/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/Keyboard/KeyboardSerial/ci.yml b/libraries/USB/examples/Keyboard/KeyboardSerial/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/Keyboard/KeyboardSerial/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/KeyboardAndMouseControl/ci.json b/libraries/USB/examples/KeyboardAndMouseControl/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/KeyboardAndMouseControl/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/KeyboardAndMouseControl/ci.yml b/libraries/USB/examples/KeyboardAndMouseControl/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/KeyboardAndMouseControl/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/MIDI/MidiController/ci.json b/libraries/USB/examples/MIDI/MidiController/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/MIDI/MidiController/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/MIDI/MidiController/ci.yml b/libraries/USB/examples/MIDI/MidiController/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/MIDI/MidiController/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/MIDI/MidiInterface/ci.json b/libraries/USB/examples/MIDI/MidiInterface/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/MIDI/MidiInterface/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/MIDI/MidiInterface/ci.yml b/libraries/USB/examples/MIDI/MidiInterface/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/MIDI/MidiInterface/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/MIDI/MidiMusicBox/ci.json b/libraries/USB/examples/MIDI/MidiMusicBox/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/MIDI/MidiMusicBox/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/MIDI/MidiMusicBox/ci.yml b/libraries/USB/examples/MIDI/MidiMusicBox/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/MIDI/MidiMusicBox/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/MIDI/ReceiveMidi/ci.json b/libraries/USB/examples/MIDI/ReceiveMidi/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/MIDI/ReceiveMidi/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/MIDI/ReceiveMidi/ci.yml b/libraries/USB/examples/MIDI/ReceiveMidi/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/MIDI/ReceiveMidi/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/Mouse/ButtonMouseControl/ci.json b/libraries/USB/examples/Mouse/ButtonMouseControl/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/Mouse/ButtonMouseControl/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/Mouse/ButtonMouseControl/ci.yml b/libraries/USB/examples/Mouse/ButtonMouseControl/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/Mouse/ButtonMouseControl/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/SystemControl/ci.json b/libraries/USB/examples/SystemControl/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/SystemControl/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/SystemControl/ci.yml b/libraries/USB/examples/SystemControl/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/SystemControl/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/USBMSC/ci.json b/libraries/USB/examples/USBMSC/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/USBMSC/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/USBMSC/ci.yml b/libraries/USB/examples/USBMSC/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/USBMSC/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/USBSerial/ci.json b/libraries/USB/examples/USBSerial/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/USBSerial/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/USBSerial/ci.yml b/libraries/USB/examples/USBSerial/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/USBSerial/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/USB/examples/USBVendor/ci.json b/libraries/USB/examples/USBVendor/ci.json
deleted file mode 100644
index f9ac7d0bec9..00000000000
--- a/libraries/USB/examples/USBVendor/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_USB_OTG_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/USB/examples/USBVendor/ci.yml b/libraries/USB/examples/USBVendor/ci.yml
new file mode 100644
index 00000000000..047516fdb45
--- /dev/null
+++ b/libraries/USB/examples/USBVendor/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_USB_OTG_SUPPORTED=y
diff --git a/libraries/Update/examples/AWS_S3_OTA_Update/ci.json b/libraries/Update/examples/AWS_S3_OTA_Update/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/Update/examples/AWS_S3_OTA_Update/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Update/examples/AWS_S3_OTA_Update/ci.yml b/libraries/Update/examples/AWS_S3_OTA_Update/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/Update/examples/AWS_S3_OTA_Update/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Update/examples/HTTPS_OTA_Update/ci.json b/libraries/Update/examples/HTTPS_OTA_Update/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/Update/examples/HTTPS_OTA_Update/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Update/examples/HTTPS_OTA_Update/ci.yml b/libraries/Update/examples/HTTPS_OTA_Update/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/Update/examples/HTTPS_OTA_Update/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.json b/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.yml b/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/Update/examples/HTTP_Client_AES_OTA_Update/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.json b/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.yml b/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/Update/examples/HTTP_Server_AES_OTA_Update/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/Update/examples/OTAWebUpdater/ci.json b/libraries/Update/examples/OTAWebUpdater/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/Update/examples/OTAWebUpdater/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/Update/examples/OTAWebUpdater/ci.yml b/libraries/Update/examples/OTAWebUpdater/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/Update/examples/OTAWebUpdater/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/AdvancedWebServer/ci.json b/libraries/WebServer/examples/AdvancedWebServer/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/AdvancedWebServer/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/AdvancedWebServer/ci.yml b/libraries/WebServer/examples/AdvancedWebServer/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/AdvancedWebServer/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/ChunkWriting/ci.json b/libraries/WebServer/examples/ChunkWriting/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/ChunkWriting/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/ChunkWriting/ci.yml b/libraries/WebServer/examples/ChunkWriting/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/ChunkWriting/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/FSBrowser/ci.json b/libraries/WebServer/examples/FSBrowser/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/FSBrowser/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/FSBrowser/ci.yml b/libraries/WebServer/examples/FSBrowser/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/FSBrowser/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/Filters/ci.json b/libraries/WebServer/examples/Filters/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/Filters/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/Filters/ci.yml b/libraries/WebServer/examples/Filters/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/Filters/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/HelloServer/ci.json b/libraries/WebServer/examples/HelloServer/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/HelloServer/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/HelloServer/ci.yml b/libraries/WebServer/examples/HelloServer/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/HelloServer/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/HttpAdvancedAuth/ci.json b/libraries/WebServer/examples/HttpAdvancedAuth/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/HttpAdvancedAuth/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/HttpAdvancedAuth/ci.yml b/libraries/WebServer/examples/HttpAdvancedAuth/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/HttpAdvancedAuth/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/HttpAuthCallback/ci.json b/libraries/WebServer/examples/HttpAuthCallback/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/HttpAuthCallback/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/HttpAuthCallback/ci.yml b/libraries/WebServer/examples/HttpAuthCallback/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/HttpAuthCallback/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/HttpAuthCallbackInline/ci.json b/libraries/WebServer/examples/HttpAuthCallbackInline/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/HttpAuthCallbackInline/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/HttpAuthCallbackInline/ci.yml b/libraries/WebServer/examples/HttpAuthCallbackInline/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/HttpAuthCallbackInline/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/HttpBasicAuth/ci.json b/libraries/WebServer/examples/HttpBasicAuth/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/HttpBasicAuth/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/HttpBasicAuth/ci.yml b/libraries/WebServer/examples/HttpBasicAuth/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/HttpBasicAuth/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.json b/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.yml b/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/HttpBasicAuthSHA1/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.json b/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.yml b/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/HttpBasicAuthSHA1orBearerToken/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/Middleware/ci.json b/libraries/WebServer/examples/Middleware/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/WebServer/examples/Middleware/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/Middleware/ci.yml b/libraries/WebServer/examples/Middleware/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/WebServer/examples/Middleware/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/WebServer/examples/MultiHomedServers/ci.json b/libraries/WebServer/examples/MultiHomedServers/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/MultiHomedServers/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/MultiHomedServers/ci.yml b/libraries/WebServer/examples/MultiHomedServers/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/MultiHomedServers/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/PathArgServer/ci.json b/libraries/WebServer/examples/PathArgServer/ci.json
deleted file mode 100644
index cbdd28f773d..00000000000
--- a/libraries/WebServer/examples/PathArgServer/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/PathArgServer/ci.yml b/libraries/WebServer/examples/PathArgServer/ci.yml
new file mode 100644
index 00000000000..9f15b3468e6
--- /dev/null
+++ b/libraries/WebServer/examples/PathArgServer/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/SDWebServer/ci.json b/libraries/WebServer/examples/SDWebServer/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/SDWebServer/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/SDWebServer/ci.yml b/libraries/WebServer/examples/SDWebServer/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/SDWebServer/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/SimpleAuthentification/ci.json b/libraries/WebServer/examples/SimpleAuthentification/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/SimpleAuthentification/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/SimpleAuthentification/ci.yml b/libraries/WebServer/examples/SimpleAuthentification/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/SimpleAuthentification/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/UploadHugeFile/ci.json b/libraries/WebServer/examples/UploadHugeFile/ci.json
deleted file mode 100644
index cbdd28f773d..00000000000
--- a/libraries/WebServer/examples/UploadHugeFile/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/UploadHugeFile/ci.yml b/libraries/WebServer/examples/UploadHugeFile/ci.yml
new file mode 100644
index 00000000000..9f15b3468e6
--- /dev/null
+++ b/libraries/WebServer/examples/UploadHugeFile/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/WebServer/ci.json b/libraries/WebServer/examples/WebServer/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/WebServer/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/WebServer/ci.yml b/libraries/WebServer/examples/WebServer/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/WebServer/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WebServer/examples/WebUpdate/ci.json b/libraries/WebServer/examples/WebUpdate/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WebServer/examples/WebUpdate/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WebServer/examples/WebUpdate/ci.yml b/libraries/WebServer/examples/WebUpdate/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WebServer/examples/WebUpdate/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/FTM/FTM_Initiator/ci.json b/libraries/WiFi/examples/FTM/FTM_Initiator/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/FTM/FTM_Initiator/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/FTM/FTM_Initiator/ci.yml b/libraries/WiFi/examples/FTM/FTM_Initiator/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/FTM/FTM_Initiator/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/FTM/FTM_Responder/ci.json b/libraries/WiFi/examples/FTM/FTM_Responder/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/FTM/FTM_Responder/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/FTM/FTM_Responder/ci.yml b/libraries/WiFi/examples/FTM/FTM_Responder/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/FTM/FTM_Responder/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/SimpleWiFiServer/ci.json b/libraries/WiFi/examples/SimpleWiFiServer/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/SimpleWiFiServer/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/SimpleWiFiServer/ci.yml b/libraries/WiFi/examples/SimpleWiFiServer/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/SimpleWiFiServer/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WPS/ci.json b/libraries/WiFi/examples/WPS/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/WiFi/examples/WPS/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WPS/ci.yml b/libraries/WiFi/examples/WPS/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/WiFi/examples/WPS/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/WiFi/examples/WiFiAccessPoint/ci.json b/libraries/WiFi/examples/WiFiAccessPoint/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiAccessPoint/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiAccessPoint/ci.yml b/libraries/WiFi/examples/WiFiAccessPoint/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiAccessPoint/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json b/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json
deleted file mode 100644
index 5be7c616d24..00000000000
--- a/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_BT_SUPPORTED=y"
-  ],
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.yml b/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.yml
new file mode 100644
index 00000000000..62aa0cb6119
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiBlueToothSwitch/ci.yml
@@ -0,0 +1,6 @@
+requires:
+  - CONFIG_SOC_BT_SUPPORTED=y
+
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiClient/ci.json b/libraries/WiFi/examples/WiFiClient/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiClient/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiClient/ci.yml b/libraries/WiFi/examples/WiFiClient/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiClient/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiClientBasic/ci.json b/libraries/WiFi/examples/WiFiClientBasic/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiClientBasic/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiClientBasic/ci.yml b/libraries/WiFi/examples/WiFiClientBasic/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiClientBasic/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiClientConnect/ci.json b/libraries/WiFi/examples/WiFiClientConnect/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiClientConnect/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiClientConnect/ci.yml b/libraries/WiFi/examples/WiFiClientConnect/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiClientConnect/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/ci.json b/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/WiFi/examples/WiFiClientEnterprise/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiClientEnterprise/ci.yml b/libraries/WiFi/examples/WiFiClientEnterprise/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiClientEnterprise/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/WiFi/examples/WiFiClientEvents/ci.json b/libraries/WiFi/examples/WiFiClientEvents/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiClientEvents/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiClientEvents/ci.yml b/libraries/WiFi/examples/WiFiClientEvents/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiClientEvents/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiClientStaticIP/ci.json b/libraries/WiFi/examples/WiFiClientStaticIP/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiClientStaticIP/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiClientStaticIP/ci.yml b/libraries/WiFi/examples/WiFiClientStaticIP/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiClientStaticIP/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiExtender/ci.json b/libraries/WiFi/examples/WiFiExtender/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiExtender/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiExtender/ci.yml b/libraries/WiFi/examples/WiFiExtender/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiExtender/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiIPv6/ci.json b/libraries/WiFi/examples/WiFiIPv6/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiIPv6/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiIPv6/ci.yml b/libraries/WiFi/examples/WiFiIPv6/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiIPv6/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiMulti/ci.json b/libraries/WiFi/examples/WiFiMulti/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiMulti/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiMulti/ci.yml b/libraries/WiFi/examples/WiFiMulti/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiMulti/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiMultiAdvanced/ci.json b/libraries/WiFi/examples/WiFiMultiAdvanced/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiMultiAdvanced/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiMultiAdvanced/ci.yml b/libraries/WiFi/examples/WiFiMultiAdvanced/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiMultiAdvanced/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiScan/ci.json b/libraries/WiFi/examples/WiFiScan/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiScan/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiScan/ci.yml b/libraries/WiFi/examples/WiFiScan/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiScan/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiScanAsync/ci.json b/libraries/WiFi/examples/WiFiScanAsync/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiScanAsync/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiScanAsync/ci.yml b/libraries/WiFi/examples/WiFiScanAsync/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiScanAsync/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiScanDualAntenna/ci.json b/libraries/WiFi/examples/WiFiScanDualAntenna/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiScanDualAntenna/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiScanDualAntenna/ci.yml b/libraries/WiFi/examples/WiFiScanDualAntenna/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiScanDualAntenna/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiScanTime/ci.json b/libraries/WiFi/examples/WiFiScanTime/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiScanTime/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiScanTime/ci.yml b/libraries/WiFi/examples/WiFiScanTime/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiScanTime/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiSmartConfig/ci.json b/libraries/WiFi/examples/WiFiSmartConfig/ci.json
deleted file mode 100644
index 36babb82730..00000000000
--- a/libraries/WiFi/examples/WiFiSmartConfig/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiSmartConfig/ci.yml b/libraries/WiFi/examples/WiFiSmartConfig/ci.yml
new file mode 100644
index 00000000000..86e194b136b
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiSmartConfig/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/WiFi/examples/WiFiTelnetToSerial/ci.json b/libraries/WiFi/examples/WiFiTelnetToSerial/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiTelnetToSerial/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiTelnetToSerial/ci.yml b/libraries/WiFi/examples/WiFiTelnetToSerial/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiTelnetToSerial/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFi/examples/WiFiUDPClient/ci.json b/libraries/WiFi/examples/WiFiUDPClient/ci.json
deleted file mode 100644
index 618e46bd244..00000000000
--- a/libraries/WiFi/examples/WiFiUDPClient/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "requires_any": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y",
-    "CONFIG_ESP_WIFI_REMOTE_ENABLED=y"
-  ]
-}
diff --git a/libraries/WiFi/examples/WiFiUDPClient/ci.yml b/libraries/WiFi/examples/WiFiUDPClient/ci.yml
new file mode 100644
index 00000000000..006e6e07dda
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiUDPClient/ci.yml
@@ -0,0 +1,3 @@
+requires_any:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
+  - CONFIG_ESP_WIFI_REMOTE_ENABLED=y
diff --git a/libraries/WiFiProv/examples/WiFiProv/ci.json b/libraries/WiFiProv/examples/WiFiProv/ci.json
deleted file mode 100644
index 04eb62b977a..00000000000
--- a/libraries/WiFiProv/examples/WiFiProv/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=huge_app",
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/WiFiProv/examples/WiFiProv/ci.yml b/libraries/WiFiProv/examples/WiFiProv/ci.yml
new file mode 100644
index 00000000000..e412162e577
--- /dev/null
+++ b/libraries/WiFiProv/examples/WiFiProv/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=huge_app
+
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y
diff --git a/libraries/Wire/examples/WireMaster/ci.json b/libraries/Wire/examples/WireMaster/ci.json
deleted file mode 100644
index 1844adfc786..00000000000
--- a/libraries/Wire/examples/WireMaster/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_I2C_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/Wire/examples/WireMaster/ci.yml b/libraries/Wire/examples/WireMaster/ci.yml
new file mode 100644
index 00000000000..f9928773b30
--- /dev/null
+++ b/libraries/Wire/examples/WireMaster/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_I2C_SUPPORTED=y
diff --git a/libraries/Wire/examples/WireScan/ci.json b/libraries/Wire/examples/WireScan/ci.json
deleted file mode 100644
index 1844adfc786..00000000000
--- a/libraries/Wire/examples/WireScan/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_I2C_SUPPORTED=y"
-  ]
-}
diff --git a/libraries/Wire/examples/WireScan/ci.yml b/libraries/Wire/examples/WireScan/ci.yml
new file mode 100644
index 00000000000..f9928773b30
--- /dev/null
+++ b/libraries/Wire/examples/WireScan/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_I2C_SUPPORTED=y
diff --git a/libraries/Wire/examples/WireSlave/ci.json b/libraries/Wire/examples/WireSlave/ci.json
deleted file mode 100644
index 3c877975d62..00000000000
--- a/libraries/Wire/examples/WireSlave/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_I2C_SUPPORT_SLAVE=y"
-  ]
-}
diff --git a/libraries/Wire/examples/WireSlave/ci.yml b/libraries/Wire/examples/WireSlave/ci.yml
new file mode 100644
index 00000000000..40e259fda10
--- /dev/null
+++ b/libraries/Wire/examples/WireSlave/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_I2C_SUPPORT_SLAVE=y
diff --git a/libraries/Wire/examples/WireSlaveFunctionalCallback/ci.json b/libraries/Wire/examples/WireSlaveFunctionalCallback/ci.json
deleted file mode 100644
index 3c877975d62..00000000000
--- a/libraries/Wire/examples/WireSlaveFunctionalCallback/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "requires": [
-    "CONFIG_SOC_I2C_SUPPORT_SLAVE=y"
-  ]
-}
diff --git a/libraries/Wire/examples/WireSlaveFunctionalCallback/ci.yml b/libraries/Wire/examples/WireSlaveFunctionalCallback/ci.yml
new file mode 100644
index 00000000000..40e259fda10
--- /dev/null
+++ b/libraries/Wire/examples/WireSlaveFunctionalCallback/ci.yml
@@ -0,0 +1,2 @@
+requires:
+  - CONFIG_SOC_I2C_SUPPORT_SLAVE=y
diff --git a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.yml b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Binary_Input_Output/ci.json b/libraries/Zigbee/examples/Zigbee_Binary_Input_Output/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Binary_Input_Output/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Binary_Input_Output/ci.yml b/libraries/Zigbee/examples/Zigbee_Binary_Input_Output/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Binary_Input_Output/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_CarbonDioxide_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.yml b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Color_Dimmable_Light/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.yml b/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Color_Dimmer_Switch/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.yml b/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Contact_Switch/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json b/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.yml b/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Dimmable_Light/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor_MultiPhase/ci.json b/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor_MultiPhase/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor_MultiPhase/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor_MultiPhase/ci.yml b/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor_MultiPhase/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Electrical_AC_Sensor_MultiPhase/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Electrical_DC_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Electrical_DC_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Electrical_DC_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Electrical_DC_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Electrical_DC_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Electrical_DC_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Fan_Control/ci.json b/libraries/Zigbee/examples/Zigbee_Fan_Control/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Fan_Control/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Fan_Control/ci.yml b/libraries/Zigbee/examples/Zigbee_Fan_Control/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Fan_Control/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Gateway/ci.json b/libraries/Zigbee/examples/Zigbee_Gateway/ci.json
deleted file mode 100644
index 23e1c59d1da..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Gateway/ci.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr_8MB,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ],
-  "targets": {
-    "esp32c6": false,
-    "esp32h2": false
-  }
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Gateway/ci.yml b/libraries/Zigbee/examples/Zigbee_Gateway/ci.yml
new file mode 100644
index 00000000000..ab3b5078f03
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Gateway/ci.yml
@@ -0,0 +1,8 @@
+fqbn_append: PartitionScheme=zigbee_zczr_8MB,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
+
+targets:
+  esp32c6: false
+  esp32h2: false
diff --git a/libraries/Zigbee/examples/Zigbee_Illuminance_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Illuminance_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Illuminance_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Illuminance_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Illuminance_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Illuminance_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/ci.json b/libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/ci.yml b/libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json b/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.yml b/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_OTA_Client/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Occupancy_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.yml b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_On_Off_Light/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_MultiSwitch/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_MultiSwitch/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_On_Off_MultiSwitch/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_MultiSwitch/ci.yml b/libraries/Zigbee/examples/Zigbee_On_Off_MultiSwitch/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_On_Off_MultiSwitch/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json b/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.yml b/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_On_Off_Switch/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_PM25_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_PM25_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_PM25_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_PM25_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_PM25_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_PM25_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Power_Outlet/ci.json b/libraries/Zigbee/examples/Zigbee_Power_Outlet/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Power_Outlet/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Power_Outlet/ci.yml b/libraries/Zigbee/examples/Zigbee_Power_Outlet/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Power_Outlet/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Pressure_Flow_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json b/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.yml b/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Range_Extender/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.yml b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Scan_Networks/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json b/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.yml b/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Temp_Hum_Sensor_Sleepy/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Temperature_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json b/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json
deleted file mode 100644
index 15d6190e4ae..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Thermostat/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
-  "requires": [
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Thermostat/ci.yml b/libraries/Zigbee/examples/Zigbee_Thermostat/ci.yml
new file mode 100644
index 00000000000..2f21922223c
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Thermostat/ci.yml
@@ -0,0 +1,4 @@
+fqbn_append: PartitionScheme=zigbee_zczr,ZigbeeMode=zczr
+
+requires:
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Vibration_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/ci.json b/libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/ci.yml b/libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Wind_Speed_Sensor/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json b/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
deleted file mode 100644
index ceacc367801..00000000000
--- a/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "fqbn_append": "PartitionScheme=zigbee,ZigbeeMode=ed",
-  "requires": [
-    "CONFIG_SOC_IEEE802154_SUPPORTED=y",
-    "CONFIG_ZB_ENABLED=y"
-  ]
-}
diff --git a/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.yml b/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.yml
new file mode 100644
index 00000000000..22315a90f3b
--- /dev/null
+++ b/libraries/Zigbee/examples/Zigbee_Window_Covering/ci.yml
@@ -0,0 +1,5 @@
+fqbn_append: PartitionScheme=zigbee,ZigbeeMode=ed
+
+requires:
+  - CONFIG_SOC_IEEE802154_SUPPORTED=y
+  - CONFIG_ZB_ENABLED=y
diff --git a/tests/performance/coremark/ci.json b/tests/performance/coremark/ci.json
deleted file mode 100644
index accee2b2135..00000000000
--- a/tests/performance/coremark/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  }
-}
diff --git a/tests/performance/coremark/ci.yml b/tests/performance/coremark/ci.yml
new file mode 100644
index 00000000000..a5625fc9fa1
--- /dev/null
+++ b/tests/performance/coremark/ci.yml
@@ -0,0 +1,3 @@
+platforms:
+  qemu: false
+  wokwi: false
diff --git a/tests/performance/fibonacci/ci.json b/tests/performance/fibonacci/ci.json
deleted file mode 100644
index accee2b2135..00000000000
--- a/tests/performance/fibonacci/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  }
-}
diff --git a/tests/performance/fibonacci/ci.yml b/tests/performance/fibonacci/ci.yml
new file mode 100644
index 00000000000..a5625fc9fa1
--- /dev/null
+++ b/tests/performance/fibonacci/ci.yml
@@ -0,0 +1,3 @@
+platforms:
+  qemu: false
+  wokwi: false
diff --git a/tests/performance/linpack_double/ci.json b/tests/performance/linpack_double/ci.json
deleted file mode 100644
index accee2b2135..00000000000
--- a/tests/performance/linpack_double/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  }
-}
diff --git a/tests/performance/linpack_double/ci.yml b/tests/performance/linpack_double/ci.yml
new file mode 100644
index 00000000000..a5625fc9fa1
--- /dev/null
+++ b/tests/performance/linpack_double/ci.yml
@@ -0,0 +1,3 @@
+platforms:
+  qemu: false
+  wokwi: false
diff --git a/tests/performance/linpack_float/ci.json b/tests/performance/linpack_float/ci.json
deleted file mode 100644
index accee2b2135..00000000000
--- a/tests/performance/linpack_float/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  }
-}
diff --git a/tests/performance/linpack_float/ci.yml b/tests/performance/linpack_float/ci.yml
new file mode 100644
index 00000000000..a5625fc9fa1
--- /dev/null
+++ b/tests/performance/linpack_float/ci.yml
@@ -0,0 +1,3 @@
+platforms:
+  qemu: false
+  wokwi: false
diff --git a/tests/performance/psramspeed/ci.json b/tests/performance/psramspeed/ci.json
deleted file mode 100644
index e981565f0ca..00000000000
--- a/tests/performance/psramspeed/ci.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "soc_tags": {
-    "esp32": [
-      "psram"
-    ],
-    "esp32s2": [
-      "psram"
-    ],
-    "esp32s3": [
-      "octal_psram"
-    ],
-    "esp32c5": [
-      "psram"
-    ]
-  },
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  },
-  "requires": [
-    "CONFIG_SPIRAM=y"
-  ]
-}
diff --git a/tests/performance/psramspeed/ci.yml b/tests/performance/psramspeed/ci.yml
new file mode 100644
index 00000000000..7e06eac7cfa
--- /dev/null
+++ b/tests/performance/psramspeed/ci.yml
@@ -0,0 +1,16 @@
+soc_tags:
+  esp32:
+    - psram
+  esp32s2:
+    - psram
+  esp32s3:
+    - octal_psram
+  esp32c5:
+    - psram
+
+platforms:
+  qemu: false
+  wokwi: false
+
+requires:
+  - CONFIG_SPIRAM=y
diff --git a/tests/performance/ramspeed/ci.json b/tests/performance/ramspeed/ci.json
deleted file mode 100644
index d880ca64dfb..00000000000
--- a/tests/performance/ramspeed/ci.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "fqbn": {
-    "esp32": [
-      "espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=huge_app"
-    ],
-    "esp32s2": [
-      "espressif:esp32:esp32s2:PSRAM=disabled,PartitionScheme=huge_app"
-    ],
-    "esp32s3": [
-      "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app"
-    ]
-  },
-  "platform": {
-    "qemu": false,
-    "wokwi": false
-  }
-}
diff --git a/tests/performance/ramspeed/ci.yml b/tests/performance/ramspeed/ci.yml
new file mode 100644
index 00000000000..1b4f093b0fc
--- /dev/null
+++ b/tests/performance/ramspeed/ci.yml
@@ -0,0 +1,11 @@
+fqbn:
+  esp32:
+    - espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=huge_app
+  esp32s2:
+    - espressif:esp32:esp32s2:PSRAM=disabled,PartitionScheme=huge_app
+  esp32s3:
+    - espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app
+
+platforms:
+  qemu: false
+  wokwi: false
diff --git a/tests/performance/superpi/ci.json b/tests/performance/superpi/ci.json
deleted file mode 100644
index accee2b2135..00000000000
--- a/tests/performance/superpi/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  }
-}
diff --git a/tests/performance/superpi/ci.yml b/tests/performance/superpi/ci.yml
new file mode 100644
index 00000000000..a5625fc9fa1
--- /dev/null
+++ b/tests/performance/superpi/ci.yml
@@ -0,0 +1,3 @@
+platforms:
+  qemu: false
+  wokwi: false
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 29b7d531bd4..bf7b600352e 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,8 +1,8 @@
 cryptography==44.0.1
 --only-binary cryptography
 pytest-cov==5.0.0
-pytest-embedded-serial-esp==2.1.0
-pytest-embedded-arduino==2.1.0
-pytest-embedded-wokwi==2.1.0
-pytest-embedded-qemu==2.1.0
+pytest-embedded-serial-esp==2.1.2
+pytest-embedded-arduino==2.1.2
+pytest-embedded-wokwi==2.1.2
+pytest-embedded-qemu==2.1.2
 esptool==5.1.0
diff --git a/tests/validation/democfg/ci.json b/tests/validation/democfg/ci.json
deleted file mode 100644
index cf5c796644e..00000000000
--- a/tests/validation/democfg/ci.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "fqbn": {
-    "esp32": [
-      "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio"
-    ],
-    "esp32s2": [
-      "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app"
-    ],
-    "esp32s3": [
-      "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"
-    ]
-  },
-  "platforms": {
-    "hardware": true,
-    "qemu": false,
-    "wokwi": false
-  },
-  "requires": [
-    "CONFIG_SOC_UART_SUPPORTED=y"
-  ],
-  "targets": {
-    "esp32": true,
-    "esp32c3": false,
-    "esp32c6": true,
-    "esp32h2": false,
-    "esp32s2": true,
-    "esp32s3": true,
-    "esp32p4": false
-  }
-}
diff --git a/tests/validation/democfg/ci.yml b/tests/validation/democfg/ci.yml
new file mode 100644
index 00000000000..d78c4b0f4eb
--- /dev/null
+++ b/tests/validation/democfg/ci.yml
@@ -0,0 +1,25 @@
+fqbn:
+  esp32:
+    - espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio
+  esp32s2:
+    - espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app
+  esp32s3:
+    - espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app
+
+platforms:
+  hardware: true
+  qemu: false
+  wokwi: false
+
+requires:
+  - CONFIG_SOC_UART_SUPPORTED=y
+
+targets:
+  esp32: true
+  esp32c3: false
+  esp32c6: true
+  esp32h2: false
+  esp32s2: true
+  esp32s3: true
+  esp32p4: false
diff --git a/tests/validation/gpio/ci.json b/tests/validation/gpio/ci.json
deleted file mode 100644
index 7bc6a6ed163..00000000000
--- a/tests/validation/gpio/ci.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "platforms": {
-    "hardware": false,
-    "qemu": false
-  }
-}
diff --git a/tests/validation/gpio/ci.yml b/tests/validation/gpio/ci.yml
new file mode 100644
index 00000000000..3f53d32a04e
--- /dev/null
+++ b/tests/validation/gpio/ci.yml
@@ -0,0 +1,3 @@
+platforms:
+  hardware: false
+  qemu: false
diff --git a/tests/validation/i2c_master/ci.json b/tests/validation/i2c_master/ci.json
deleted file mode 100644
index 2b8792cd131..00000000000
--- a/tests/validation/i2c_master/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "platforms": {
-    "hardware": false,
-    "qemu": false
-  },
-  "requires": [
-    "CONFIG_SOC_I2C_SUPPORTED=y"
-  ]
-}
diff --git a/tests/validation/i2c_master/ci.yml b/tests/validation/i2c_master/ci.yml
new file mode 100644
index 00000000000..fcf344e3e07
--- /dev/null
+++ b/tests/validation/i2c_master/ci.yml
@@ -0,0 +1,6 @@
+platforms:
+  hardware: false
+  qemu: false
+
+requires:
+  - CONFIG_SOC_I2C_SUPPORTED=y
diff --git a/tests/validation/nvs/ci.json b/tests/validation/nvs/ci.json
deleted file mode 100644
index 7f8ce83ec54..00000000000
--- a/tests/validation/nvs/ci.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "fqbn": {
-    "esp32": [
-      "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio"
-    ],
-    "esp32c3": [
-      "espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=qio"
-    ],
-    "esp32c6": [
-      "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=40",
-      "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=qio",
-      "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=qio,FlashFreq=40"
-    ],
-    "esp32h2": [
-      "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=16",
-      "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio",
-      "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio,FlashFreq=16"
-    ],
-    "esp32s2": [
-      "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio"
-    ],
-    "esp32s3": [
-      "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
-      "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
-      "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio"
-    ],
-    "esp32p4": [
-      "espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio,FlashFreq=40",
-      "espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
-      "espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio,FlashFreq=40"
-    ]
-  },
-  "platforms": {
-    "qemu": false
-  }
-}
diff --git a/tests/validation/nvs/ci.yml b/tests/validation/nvs/ci.yml
new file mode 100644
index 00000000000..bebad7c1014
--- /dev/null
+++ b/tests/validation/nvs/ci.yml
@@ -0,0 +1,32 @@
+fqbn:
+  esp32:
+    - espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio
+  esp32c3:
+    - espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=qio
+  esp32c6:
+    - espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=40
+    - espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=qio
+    - espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=qio,FlashFreq=40
+  esp32h2:
+    - espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=16
+    - espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio
+    - espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio,FlashFreq=16
+  esp32s2:
+    - espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio
+  esp32s3:
+    - espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio
+    - espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120
+    - espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio
+  esp32p4:
+    - espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=dio,FlashFreq=40
+    - espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio
+    - espressif:esp32:esp32p4:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio,FlashFreq=40
+
+platforms:
+  qemu: false
diff --git a/tests/validation/periman/ci.json b/tests/validation/periman/ci.json
deleted file mode 100644
index 22ff71c54ff..00000000000
--- a/tests/validation/periman/ci.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  },
-  "targets": {
-    "esp32p4": false
-  }
-}
diff --git a/tests/validation/periman/ci.yml b/tests/validation/periman/ci.yml
new file mode 100644
index 00000000000..85d8f908f4e
--- /dev/null
+++ b/tests/validation/periman/ci.yml
@@ -0,0 +1,6 @@
+platforms:
+  qemu: false
+  wokwi: false
+
+targets:
+  esp32p4: false
diff --git a/tests/validation/psram/ci.json b/tests/validation/psram/ci.json
deleted file mode 100644
index 4d426d38c30..00000000000
--- a/tests/validation/psram/ci.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "soc_tags": {
-    "esp32": [
-      "psram"
-    ],
-    "esp32s2": [
-      "psram"
-    ],
-    "esp32s3": [
-      "octal_psram"
-    ],
-    "esp32c5": [
-      "psram"
-    ]
-  },
-  "platforms": {
-    "qemu": false
-  },
-  "requires": [
-    "CONFIG_SPIRAM=y"
-  ]
-}
diff --git a/tests/validation/psram/ci.yml b/tests/validation/psram/ci.yml
new file mode 100644
index 00000000000..9324401b678
--- /dev/null
+++ b/tests/validation/psram/ci.yml
@@ -0,0 +1,16 @@
+soc_tags:
+  esp32:
+    - psram
+  esp32s2:
+    - psram
+  esp32s3:
+    - octal_psram
+  esp32c5:
+    - psram
+  # Runners for ESP32-P4 have PSRAM by default. There are no runners with psram tag.
+
+platforms:
+  qemu: false
+
+requires:
+  - CONFIG_SPIRAM=y
diff --git a/tests/validation/touch/ci.json b/tests/validation/touch/ci.json
deleted file mode 100644
index 3ccb5dfabe8..00000000000
--- a/tests/validation/touch/ci.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "fqbn_append": "DebugLevel=verbose",
-  "platforms": {
-    "qemu": false,
-    "wokwi": false
-  },
-  "requires": [
-    "CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y"
-  ]
-}
diff --git a/tests/validation/touch/ci.yml b/tests/validation/touch/ci.yml
new file mode 100644
index 00000000000..93fd0a8d591
--- /dev/null
+++ b/tests/validation/touch/ci.yml
@@ -0,0 +1,8 @@
+fqbn_append: DebugLevel=verbose
+
+platforms:
+  qemu: false
+  wokwi: false
+
+requires:
+  - CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
diff --git a/tests/validation/uart/ci.json b/tests/validation/uart/ci.json
deleted file mode 100644
index 54da33b6176..00000000000
--- a/tests/validation/uart/ci.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "platforms": {
-    "qemu": false
-  }
-}
diff --git a/tests/validation/uart/ci.yml b/tests/validation/uart/ci.yml
new file mode 100644
index 00000000000..948813f74eb
--- /dev/null
+++ b/tests/validation/uart/ci.yml
@@ -0,0 +1,2 @@
+platforms:
+  qemu: false
diff --git a/tests/validation/wifi/ci.json b/tests/validation/wifi/ci.json
deleted file mode 100644
index 54dd47ae9a9..00000000000
--- a/tests/validation/wifi/ci.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "tags": [
-    "wifi"
-  ],
-  "fqbn": {
-    "esp32": [
-      "espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=huge_app,FlashMode=dio"
-    ],
-    "esp32s2": [
-      "espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
-      "espressif:esp32:esp32s2:PSRAM=disabled,PartitionScheme=huge_app,FlashMode=dio"
-    ],
-    "esp32s3": [
-      "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
-      "espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
-      "espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio"
-    ]
-  },
-  "platforms": {
-    "hardware": false,
-    "qemu": false
-  },
-  "requires": [
-    "CONFIG_SOC_WIFI_SUPPORTED=y"
-  ]
-}
diff --git a/tests/validation/wifi/ci.yml b/tests/validation/wifi/ci.yml
new file mode 100644
index 00000000000..56005ad43a0
--- /dev/null
+++ b/tests/validation/wifi/ci.yml
@@ -0,0 +1,21 @@
+tags:
+  - wifi_router
+
+fqbn:
+  esp32:
+    - espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=huge_app,FlashMode=dio
+  esp32s2:
+    - espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio
+    - espressif:esp32:esp32s2:PSRAM=disabled,PartitionScheme=huge_app,FlashMode=dio
+  esp32s3:
+    - espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio
+    - espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio
+    - espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio
+
+platforms:
+  hardware: false
+  qemu: false
+
+requires:
+  - CONFIG_SOC_WIFI_SUPPORTED=y