diff --git a/packages/climate/climate.yaml b/packages/climate/climate.yaml
index 6de6d7f..6da1115 100644
--- a/packages/climate/climate.yaml
+++ b/packages/climate/climate.yaml
@@ -13,6 +13,12 @@ input_select:
       - Manual
       - Paused
 
+template:
+  binary_sensor:
+    - name: HVAC Fan Running
+      state: >
+        {{ 'Running' in state_attr('climate.thermostat', 'fan_state') }}
+
 # -----------------------------------------------------------------------------
 # Climate Automations
 automation:
diff --git a/packages/media/media.yaml b/packages/media/media.yaml
index f1a20d2..6e8f9c7 100644
--- a/packages/media/media.yaml
+++ b/packages/media/media.yaml
@@ -122,9 +122,9 @@ automation:
 
   - alias: Turn Up Volume when HVAC Fan Starts
     trigger:
-      - platform: template
-        value_template: >
-          {{ iif('Running' in state_attr('climate.thermostat', 'fan_state'), 'true', 'false') }}
+     - platform: state
+        entity_id: binary_sensor.hvac_fan_running
+        to: "on"
     condition:
       - "{{ is_state('input_boolean.ht_adjust_volume_hvac', 'on') }}"
       - "{{ is_state('media_player.living_room_receiver', 'on') }}"
@@ -138,9 +138,9 @@ automation:
 
   - alias: Turn Down Volume when HVAC Fan Stops
     trigger:
-      - platform: template
-        value_template: >
-          {{ iif('Running' in state_attr('climate.thermostat', 'fan_state'), 'false', 'true') }}
+      - platform: state
+        entity_id: binary_sensor.hvac_fan_running
+        from: "on"
     condition:
       - "{{ is_state('input_boolean.ht_adjust_volume_hvac', 'on') }}"
       - "{{ is_state('media_player.living_room_receiver', 'on') }}"