diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 077d33a..0f6c290 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -3,11 +3,11 @@ name: Validate ESPHome
 on:
   push:
     paths:
-      - "nspanel_esphome.yaml"
+      - "nspanel_esphome*.yaml"
       - "advanced/esphome/nspanel_esphome*.yaml"
   pull_request:
     paths:
-      - "nspanel_esphome.yaml"
+      - "nspanel_esphome*.yaml"
       - "advanced/esphome/nspanel_esphome*.yaml"
   #schedule:
   #  - cron: "0 0 * * *"
@@ -26,12 +26,18 @@ jobs:
       - uses: actions/checkout@v4.1.0
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
+      - name: Validate nspanel_esphome_core.yaml
+        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_core.yaml
+      - name: Validate nspanel_esphome_addon_upload_tft.yaml
+        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
       - name: Validate nspanel_esphome_advanced.yaml
         run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
+      - name: Validate nspanel_esphome_addon_climate_base.yaml
+        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
+        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml
 
   build_core:
     name: Core
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index 94abc6d..72be35e 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - "nspanel_esphome.yaml"
+      - "nspanel_esphome*.yaml"
       - "advanced/esphome/nspanel_esphome*.yaml"
   #schedule:
     #- cron: "0 0 * * *"
@@ -22,12 +22,18 @@ jobs:
       - uses: actions/checkout@v4.1.0
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
+      - name: Validate nspanel_esphome_core.yaml
+        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_core.yaml
+      - name: Validate nspanel_esphome_addon_upload_tft.yaml
+        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
       - name: Validate nspanel_esphome_advanced.yaml
         run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_advanced.yaml
+      - name: Validate nspanel_esphome_addon_climate_base.yaml
+        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
+        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
-        run: yamllint -c "./.yamllint/rules.yml" advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_addon_climate_heat.yaml
 
   build_core:
     name: Core