diff --git a/packages/energy/energy.yaml b/packages/energy/energy.yaml
index b2250d3..a41f58c 100644
--- a/packages/energy/energy.yaml
+++ b/packages/energy/energy.yaml
@@ -481,8 +481,8 @@ template:
 # Utility Meters
 utility_meter:
   daily_energy:
-    source: sensor.emporia_net_energy
-    name: Daily Energy
+    source: sensor.total_energy_from_grid
+    name: Daily Energy Consumption
     cycle: daily
     tariffs:
       - Super Off-Peak
@@ -490,6 +490,36 @@ utility_meter:
       - Mid-Peak
       - On-Peak
 
+  monthly_consumed:
+    source: sensor.total_energy_from_grid
+    name: Monthly Energy Consumption
+    cron: 0 0 10 * *
+    tariffs:
+      - Super Off-Peak
+      - Off-Peak
+      - Mid-Peak
+      - On-Peak
+
+  monthly_generated:
+    source: sensor.total_energy_to_grid
+    name: Monthly Energy Generation
+    cron: 0 0 10 * *
+
+  yearly_consumed:
+    source: sensor.total_energy_from_grid
+    name: Yearly Energy Consumption
+    cron: 0 0 10 7 *
+    tariffs:
+      - Super Off-Peak
+      - Off-Peak
+      - Mid-Peak
+      - On-Peak
+
+  yearly_generated:
+    source: sensor.total_energy_to_grid
+    name: Yearly Energy Generation
+    cron: 0 0 10 7 *
+
 
 automation:
 # -----------------------------------------------------------------------------
@@ -506,3 +536,16 @@ automation:
           entity_id: select.daily_energy
         data:
           option: "{{ sensor.tou_period }}"
+
+      - service: select.select_option
+        target:
+          entity_id: select.monthly_consumed
+        data:
+          option: "{{ sensor.tou_period }}"
+
+      - service: select.select_option
+        target:
+          entity_id: select.yearly_consumed
+        data:
+          option: "{{ sensor.tou_period }}"
+
diff --git a/packages/energy/energy.yaml.j2 b/packages/energy/energy.yaml.j2
index 2c46a04..c340da1 100644
--- a/packages/energy/energy.yaml.j2
+++ b/packages/energy/energy.yaml.j2
@@ -132,8 +132,8 @@ template:
 # Utility Meters
 utility_meter:
   daily_energy:
-    source: sensor.emporia_net_energy
-    name: Daily Energy
+    source: sensor.total_energy_from_grid
+    name: Daily Energy Consumption
     cycle: daily
     tariffs:
       - Super Off-Peak
@@ -141,6 +141,36 @@ utility_meter:
       - Mid-Peak
       - On-Peak
 
+  monthly_consumed:
+    source: sensor.total_energy_from_grid
+    name: Monthly Energy Consumption
+    cron: 0 0 10 * *
+    tariffs:
+      - Super Off-Peak
+      - Off-Peak
+      - Mid-Peak
+      - On-Peak
+
+  monthly_generated:
+    source: sensor.total_energy_to_grid
+    name: Monthly Energy Generation
+    cron: 0 0 10 * *
+
+  yearly_consumed:
+    source: sensor.total_energy_from_grid
+    name: Yearly Energy Consumption
+    cron: 0 0 10 7 *
+    tariffs:
+      - Super Off-Peak
+      - Off-Peak
+      - Mid-Peak
+      - On-Peak
+
+  yearly_generated:
+    source: sensor.total_energy_to_grid
+    name: Yearly Energy Generation
+    cron: 0 0 10 7 *
+
 
 automation:
 # -----------------------------------------------------------------------------
@@ -158,3 +188,16 @@ automation:
         data:
           option: "{{ sensor.tou_period }}"
 
+      - service: select.select_option
+        target:
+          entity_id: select.monthly_consumed
+        data:
+          option: "{{ sensor.tou_period }}"
+
+      - service: select.select_option
+        target:
+          entity_id: select.yearly_consumed
+        data:
+          option: "{{ sensor.tou_period }}"
+
+