diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index f3b8fef..fefe01f 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -71,46 +71,35 @@ jobs:
 
   build_basic:
     name: Basic
-    needs: [code_scan, setup_dependencies]
+    needs:
+      - code_scan
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - id: ard
-            yaml_file: ".test/esphome_ard_basic.yaml"
-            cache-hit: ${{ needs.setup_dependencies.outputs.cache-hit-arduino }}
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
-
-      - name: Firmware
-        if: steps.matrix.outputs.cache-hit != 'true'
+      - uses: actions/checkout@main
+      - name: Build core
         uses: esphome/build-action@v2.0.0
         with:
-          yaml_file: ${{ matrix.yaml_file }}
+          yaml_file: ".test/esphome_ard_basic.yaml"
 
-  build_bluetooth_proxy:
-    name: Bluetooth Proxy
+  build_bluetooth_proxy_4:
+    name: Bluetooth Proxy (IDF v4)
     needs: build_basic
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - id: idf_v4
-            base: idf_v4
-            yaml_file: ".test/esphome_idf_bluetooth_proxy.yaml"
-          - id: idf_v5
-            base: idf_v5
-            yaml_file: ".test/esphome_idf5_bluetooth_proxy.yaml"
-
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@main
+      - uses: actions/checkout@main
+      - name: Build core
+        uses: esphome/build-action@v2.0.0
+        with:
+          yaml_file: ".test/esphome_idf_bluetooth_proxy.yaml"
 
-      - name: Build Bluetooth Proxy Firmware
+  build_bluetooth_proxy_5:
+    name: Bluetooth Proxy (IDF v5)
+    needs: build_basic
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@main
+      - name: Build core
         uses: esphome/build-action@v2.0.0
         with:
-          yaml_file: ${{ matrix.yaml_file }}
+          yaml_file: ".test/esphome_idf5_bluetooth_proxy.yaml"
 ...