diff --git a/automations.yaml b/automations.yaml
index 547f9c7..caa53bd 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -2189,17 +2189,25 @@
   - platform: time_pattern
     minutes: /5
   condition:
-  - condition: template
-    value_template: '{% from ''time.jinja'' import ct %} {% set ct = ct() | int %}
-      {{ ct <= 63900 }}
-
-      '
+  - condition: time
+    before: '18:00:00'
   action:
   - service: input_number.set_value
     target:
       entity_id: input_number.today_corrected_high_temp
     data:
       value: '{{ states(''sensor.todays_high_temp'') | int }}'
+    alias: Update corrected high temp for today
+  - if:
+    - condition: time
+      after: 06:10:00
+    then:
+    - service: input_number.set_value
+      data:
+        value: '{{ states(''sensor.tomorrow_s_high_temp'') | int }}'
+      target:
+        entity_id: input_number.tomorrow_corrected_high_temp
+    alias: If after 6:10am, also update high temp for tomorrow
   mode: single
 - id: '1696288846954'
   alias: Tony Meds Handler
diff --git a/packages/custom_weather.yaml b/packages/custom_weather.yaml
index b3e3a5a..fdecab5 100644
--- a/packages/custom_weather.yaml
+++ b/packages/custom_weather.yaml
@@ -836,6 +836,13 @@ template:
       state: >-
         {% set forecast = state_attr('weather.iron_nerd_weather_station','forecast')[0] %}
         {{ forecast.temperature }}
+    - name: "Tomorrow's High Temp"
+      unique_id: b9dfc26a-d557-46b4-a6eb-a215c7bbe494
+      unit_of_measurement: '°F'
+      device_class: temperature
+      state: >-
+        {% set forecast = state_attr('weather.iron_nerd_weather_station','forecast')[2] %}
+        {{ forecast.temperature }}
     - name: "Tonight's Low Temp"
       unique_id: 8ddc55b6-4728-4897-a32f-90be970f744b
       unit_of_measurement: '°F'
@@ -1143,6 +1150,14 @@ input_number:
     unit_of_measurement: °F
     icon: mdi:thermometer
     mode: box
+  tomorrow_corrected_high_temp:
+    name: Tomorrow Corrected High Temp
+    min: -150
+    max: 100
+    step: 1
+    unit_of_measurement: °F
+    icon: mdi:thermometer
+    mode: box
 
 input_boolean:
   freeze_warning: