diff --git a/packages/custom_weather.yaml b/packages/custom_weather.yaml
index 4ec10c8..4c78801 100644
--- a/packages/custom_weather.yaml
+++ b/packages/custom_weather.yaml
@@ -3,14 +3,19 @@ weather:
     name: "Iron Nerd Weather Station"
     condition_template: "{{ states('weather.iron_nerd_studios') }}"
     temperature_template: "{{ states('sensor.pirateweather_temperature') | float }}"
+    temperature_unit: °F
     humidity_template: "{{ states('sensor.pirateweather_humidity') | float }}"
-    forecast_template: "{{ state_attr('weather.iron_nerd_studios', 'forecast') }}"
+    forecast_template: "{{ state_attr('weather.openweathermap', 'forecast') }}"
     pressure_template: "{{ states('sensor.kdfi_barometric_pressure') | float }}"
+    pressure_unit: inHg
     wind_speed_template: "{{ states('sensor.pirateweather_wind_speed') | float }}"
+    wind_speed_unit: mph
     wind_bearing_template: "{{ states('sensor.pirateweather_wind_bearing') | float }}"
     visibility_template: "{{ states('sensor.kdfi_visibility') | float }}"
+    visibility_unit: mi
     attribution_template: "Weather data from Iron Nerd's custom weather station template"
     ozone_template: "{{ states('sensor.pirateweather_ozone') | float }}"
+    precipitation_unit: in
 
 template:
   - binary_sensor: