diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome_build.yml
similarity index 61%
rename from .github/workflows/validate_esphome.yml
rename to .github/workflows/validate_esphome_build.yml
index 755927a..1845736 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome_build.yml
@@ -1,4 +1,4 @@
-name: Validate ESPHome YAML
+name: Validate ESPHome build
 
 on:
   push:
@@ -11,18 +11,10 @@ on:
 
 jobs:
   code_scan:
-    name: Validate ESPHome YAML
+    name: Validate ESPHome build
     runs-on: "ubuntu-latest"
     steps:
       - uses: actions/checkout@v4.1.0
-      - 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: Build core
         uses: esphome/build-action@v1.8.0
         with:
diff --git a/.github/workflows/validate_esphome_yaml.yml b/.github/workflows/validate_esphome_yaml.yml
new file mode 100644
index 0000000..dbe3f8c
--- /dev/null
+++ b/.github/workflows/validate_esphome_yaml.yml
@@ -0,0 +1,25 @@
+name: Validate ESPHome YAML
+
+on:
+  push:
+    paths:
+      - "nspanel_esphome*.yaml"
+  pull_request:
+  #schedule:
+  #  - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  code_scan:
+    name: Validate ESPHome YAML
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: actions/checkout@v4.1.0
+      - 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