diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 701826e..e17b2df 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -30,8 +30,8 @@ jobs:
           fetch-depth: '0'
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome.yaml
-      - name: Validate nspanel_esphome_basic.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_basic.yaml
+      - name: Validate nspanel_esphome_core.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_core.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
@@ -63,7 +63,7 @@ jobs:
       - name: Build core
         uses: esphome/build-action@v1.8.0
         with:
-          yaml_file: "./.test/esphome_core.yaml"
+          yaml_file: "./.test/esphome_basic.yaml"
 
   build_advanced:
     name: Advanced
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index c641e21..3a20f28 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -20,8 +20,8 @@ jobs:
           fetch-depth: '0'
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome.yaml
-      - name: Validate nspanel_esphome_basic.yaml
-        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_basic.yaml
+      - name: Validate nspanel_esphome_core.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_core.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
@@ -53,7 +53,7 @@ jobs:
       - name: Build core
         uses: esphome/build-action@v1.8.0
         with:
-          yaml_file: "./.test/esphome_core.yaml"
+          yaml_file: "./.test/esphome_basic.yaml"
           version: beta
 
   build_advanced: