diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 7fc7e72..88de666 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -31,3 +31,15 @@ jobs:
         uses: esphome/build-action@v1.8.0
         with:
           yaml_file: "./.test/esphome_advanced.yaml"
+      - name: Build core+climate_heat
+        uses: esphome/build-action@v1.8.0
+        with:
+          yaml_file: "./.test/esphome_climate_heat.yaml"
+      - name: Build core+climate_cold
+        uses: esphome/build-action@v1.8.0
+        with:
+          yaml_file: "./.test/esphome_climate_cold.yaml"
+      - name: Build core+advanced+climate_heat
+        uses: esphome/build-action@v1.8.0
+        with:
+          yaml_file: "./.test/esphome_advanced_climate_heat.yaml"
diff --git a/.test/esphome_advanced.yaml b/.test/esphome_advanced.yaml
index 71a5551..067ac9a 100644
--- a/.test/esphome_advanced.yaml
+++ b/.test/esphome_advanced.yaml
@@ -7,3 +7,5 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   advanced_package: !include ../nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
diff --git a/.test/esphome_advanced_climate_heat.yaml b/.test/esphome_advanced_climate_heat.yaml
new file mode 100644
index 0000000..11d69e1
--- /dev/null
+++ b/.test/esphome_advanced_climate_heat.yaml
@@ -0,0 +1,11 @@
+substitutions:
+  device_name: nspanel
+  wifi_ssid: "nspanel"
+  wifi_password: "NSPanel_HA_Blueprint"
+  nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
+
+packages:
+  core_package: !include ../nspanel_esphome.yaml # Core package
+  advanced_package: !include ../nspanel_esphome_advanced.yaml
+  addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
diff --git a/.test/esphome_climate_cold.yaml b/.test/esphome_climate_cold.yaml
new file mode 100644
index 0000000..667b391
--- /dev/null
+++ b/.test/esphome_climate_cold.yaml
@@ -0,0 +1,11 @@
+substitutions:
+  device_name: nspanel
+  wifi_ssid: "nspanel"
+  wifi_password: "NSPanel_HA_Blueprint"
+  nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
+
+packages:
+  core_package: !include ../nspanel_esphome.yaml # Core package
+  #advanced_package: !include ../nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
diff --git a/.test/esphome_climate_heat.yaml b/.test/esphome_climate_heat.yaml
new file mode 100644
index 0000000..d078834
--- /dev/null
+++ b/.test/esphome_climate_heat.yaml
@@ -0,0 +1,11 @@
+substitutions:
+  device_name: nspanel
+  wifi_ssid: "nspanel"
+  wifi_password: "NSPanel_HA_Blueprint"
+  nextion_update_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/dummy"
+
+packages:
+  core_package: !include ../nspanel_esphome.yaml # Core package
+  #advanced_package: !include ../nspanel_esphome_advanced.yaml
+  addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
diff --git a/.test/esphome_core.yaml b/.test/esphome_core.yaml
index e2c4860..1bc8f7e 100644
--- a/.test/esphome_core.yaml
+++ b/.test/esphome_core.yaml
@@ -6,3 +6,6 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
+  #advanced_package: !include ../nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml