diff --git a/.github/workflows/build_esphome.yml b/.github/workflows/build_esphome.yml
index dcb9207..8a3dce5 100644
--- a/.github/workflows/build_esphome.yml
+++ b/.github/workflows/build_esphome.yml
@@ -1,3 +1,19 @@
-uses: esphome/build-action@v1
-with:
-  yaml_file: nspanel_esphome_prebuilt.yaml
\ No newline at end of file
+name: Build ESPHome binary
+
+on:
+  push:
+    paths:
+      - "nspanel_esphome_*.yaml"
+  pull_request:
+  #schedule:
+  #  - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  code_scan:
+    name: Build ESPHome binary
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: esphome/build-action@v1
+        with:
+          yaml_file: nspanel_esphome_prebuilt.yaml
\ No newline at end of file
diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index e733247..5d10c9d 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -3,7 +3,7 @@ name: Validate ESPHome YAML
 on:
   push:
     paths:
-      - "nspanel_esphome.yaml"
+      - "nspanel_esphome_*.yaml"
   pull_request:
   #schedule:
   #  - cron: "0 0 * * *"
@@ -11,9 +11,17 @@ on:
 
 jobs:
   code_scan:
-    name: Validate Blueprint YAML
+    name: Validate ESPHome YAML
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v3
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome.yaml
+      - name: Validate nspanel_esphome_advanced.yaml
+        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_advanced.yaml
+      - name: Validate 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" nspanel_esphome_addon_climate_heat.yaml
+      - name: Validate nspanel_esphome_prebuilt.yaml
+        run: yamllint -c "./.yamllint/rules.yml" nspanel_esphome_prebuilt.yaml