diff --git a/packages/energy/energy.yaml b/packages/energy/energy.yaml
index d729edd..c948241 100644
--- a/packages/energy/energy.yaml
+++ b/packages/energy/energy.yaml
@@ -42,7 +42,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147113780')|float 
@@ -57,7 +57,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147116830')|float 
@@ -72,7 +72,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147117162')|float 
@@ -87,7 +87,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147117631')|float 
@@ -102,7 +102,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147122858')|float 
@@ -117,7 +117,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147123517')|float 
@@ -132,7 +132,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147125027')|float 
@@ -147,7 +147,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147125590')|float 
@@ -162,7 +162,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147125734')|float 
@@ -177,7 +177,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147125902')|float 
@@ -192,7 +192,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147126079')|float 
@@ -207,7 +207,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147126357')|float 
@@ -222,7 +222,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147126997')|float 
@@ -237,7 +237,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147128369')|float 
@@ -252,7 +252,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147129445')|float 
@@ -267,7 +267,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147130152')|float 
@@ -282,7 +282,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_202147130290')|float 
diff --git a/packages/energy/energy.yaml.j2 b/packages/energy/energy.yaml.j2
index 14b5609..7c72c28 100644
--- a/packages/energy/energy.yaml.j2
+++ b/packages/energy/energy.yaml.j2
@@ -27,7 +27,7 @@ template:
       availability: "{{ states('sensor.envoy_inverter_average_power')|float > 5 }}"
       state: >
         {% if states('sensor.envoy_inverter_average_power')|float == 0 %}
-          undefined
+          none
         {% else %}
           {{ (100 * 
                   states('sensor.envoy_202221032900_inverter_[[sn]]')|float