diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml
index 34229c2e..65676218 100755
--- a/config/packages/powerwall.yaml
+++ b/config/packages/powerwall.yaml
@@ -125,6 +125,69 @@ automation:
             - switch.poe_garage_port_5_poe
             - switch.poe_garage_port_6_poe
 
+  - alias: "Powerwall outage - Rheem WH off at night"
+    id: d686f650-65ad-4cc6-8e27-8b5ee76b5338
+    description: "During outages, turn off the water heater after sunset to protect battery"
+    mode: single
+    trigger:
+      - platform: sun
+        event: sunset
+      - platform: state
+        entity_id: binary_sensor.powerwall_grid_status
+        to: 'off'
+        for:
+          minutes: 1
+    condition:
+      - condition: state
+        entity_id: binary_sensor.powerwall_grid_status
+        state: 'off'
+      - condition: or
+        conditions:
+          - condition: sun
+            after: sunset
+          - condition: sun
+            before: sunrise
+    action:
+      - service: water_heater.set_operation_mode
+        target:
+          entity_id: water_heater.rheem_wh
+        data:
+          state: off
+
+  - alias: "Powerwall outage - Rheem WH heat pump after sunrise and 50%"
+    id: 7b6e8bb0-7d0c-4e63-89cf-ff6e7811b579
+    description: "During outages, restore water heater to heat pump once battery is healthy during daytime"
+    mode: single
+    trigger:
+      - platform: sun
+        event: sunrise
+      - platform: numeric_state
+        entity_id: sensor.powerwall_charge
+        above: 50
+        for:
+          minutes: 5
+      - platform: state
+        entity_id: binary_sensor.powerwall_grid_status
+        to: 'off'
+        for:
+          minutes: 1
+    condition:
+      - condition: state
+        entity_id: binary_sensor.powerwall_grid_status
+        state: 'off'
+      - condition: numeric_state
+        entity_id: sensor.powerwall_charge
+        above: 50
+      - condition: sun
+        after: sunrise
+        before: sunset
+    action:
+      - service: water_heater.set_operation_mode
+        target:
+          entity_id: water_heater.rheem_wh
+        data:
+          state: heat_pump
+
 # https://github.com/CCOSTAN/Home-AssistantConfig/issues/547
   - alias: Turn off the Nest Thermostats during a Power Outage
     id: 022bd9da-ab7c-4c1b-9e95-2ff4ffe5f9cc
diff --git a/config/packages/rheem_econet.yaml b/config/packages/rheem_econet.yaml
index 140475a8..7ef4ef65 100755
--- a/config/packages/rheem_econet.yaml
+++ b/config/packages/rheem_econet.yaml
@@ -5,6 +5,7 @@
 # https://github.com/CCOSTAN/Home-AssistantConfig/issues/892
 # https://www.home-assistant.io/integrations/econet/
 #-------------------------------------------
+# Powerwall outage control for Rheem WH lives in config/packages/powerwall.yaml
 
 ##############################################################################
 ###  Automations
@@ -76,6 +77,22 @@ automation:
         data:
           value1: "The available hot water is now above 50%. Normal showering can resume. Gallons used today: {{sensor.phyn_daily_water_usage}}"
 
+#-------------------------------------------
+# Available Rheem entities snapshot (for reference)
+# automation.rheem_water_heater_health_monitoring
+# automation.rheem_water_heater_hot_water_availability_alert
+# binary_sensor.rheem_wh_running
+# binary_sensor.rheem_wh_shutoff_valve
+# sensor.rheem_wh_alert_count
+# sensor.rheem_wh_available_hot_water
+# sensor.rheem_wh_compressor_health
+# sensor.rheem_wh_override_status
+# sensor.rheem_wh_power_usage_today
+# sensor.rheem_wh_running_state
+# sensor.rheem_wh_tank_health
+# sensor.rheem_wh_water_usage_today
+# sensor.rheem_wh_wifi_signal
+# water_heater.rheem_wh