diff --git a/automations/02_alerts_and_notifications.yaml b/automations/02_alerts_and_notifications.yaml
index 3f60cff..3206909 100644
--- a/automations/02_alerts_and_notifications.yaml
+++ b/automations/02_alerts_and_notifications.yaml
@@ -13,6 +13,7 @@
     data:
       message: Garage floodlight batteries low
       title: Garage floodlight batteries low
+      token: !secret notify_event_alerts_token
   mode: single
 
 - id: '1742841280696'
diff --git a/automations/07_climate_and_plugs.yaml b/automations/07_climate_and_plugs.yaml
index 39622b7..72d72f3 100644
--- a/automations/07_climate_and_plugs.yaml
+++ b/automations/07_climate_and_plugs.yaml
@@ -60,3 +60,4 @@
     data:
       title: Dehumidifier tank is full
       message: Dehumidifier tank is full — Parents Window Fan outlet has been turned off.
+      token: !secret notify_event_alerts_token
diff --git a/configuration.yaml b/configuration.yaml
index e128e23..1918115 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -30,10 +30,8 @@ http:
     - 10.60.1.1
 
 ### notify_events ###
-notify_events_cats:
-  token:  !secret notify_event_cats_token
-notify_events_alerts:
-  token:  !secret notify_event_alerts_token
+notify_events:
+  token: !secret notify_event_cats_token
 ### SMTP ###
 notify:
   - name: "mailgun_smtp"
diff --git a/packages/cat_medication_tracker_ha.yaml b/packages/cat_medication_tracker_ha.yaml
index 0dc93bb..e6659e8 100644
--- a/packages/cat_medication_tracker_ha.yaml
+++ b/packages/cat_medication_tracker_ha.yaml
@@ -50,7 +50,7 @@ automation:
         entity_id: binary_sensor.cat_medication_tracker_all_cats_medicated
         to: "on"
     action:
-      - service: notify.notify_events
+      - service: notify.notify_events_cats
         data:
           title: "Cat meds done"
           message: "Penelope and Tess have both been marked medicated today."
@@ -73,7 +73,7 @@ automation:
           cat_name: >
             {% if trigger.id == 'penelope' %}Penelope
             {% else %}Tess{% endif %}
-      - service: notify.notify_events
+      - service: notify.notify_events_cats
         data:
           title: "Cat medication given"
           message: "{{ cat_name }} has been marked medicated."
@@ -88,7 +88,7 @@ automation:
         entity_id: binary_sensor.cat_medication_tracker_all_cats_medicated
         state: "off"
     action:
-      - service: notify.notify_events
+      - service: notify.notify_events_cats
         data:
           title: "Cat meds still needed"
           message: >
diff --git a/packages/litter_box_monitor.yaml b/packages/litter_box_monitor.yaml
index 2164b6f..5345109 100644
--- a/packages/litter_box_monitor.yaml
+++ b/packages/litter_box_monitor.yaml
@@ -200,7 +200,7 @@ automation:
       - action: timer.start
         target:
           entity_id: timer.litter_box_cat_cooldown
-      - action: notify.notify_events
+      - action: notify.notify_events_cats
         data:
           message: "🐱 A cat is using the litter box right now!"
           title: "Litter Box Activity"
@@ -239,7 +239,7 @@ automation:
       - action: input_boolean.turn_on
         target:
           entity_id: input_boolean.litter_box_stuck_notified
-      - action: notify.notify_events
+      - action: notify.notify_events_cats
         data:
           message: "⚠️ The litter box is STUCK ROTATED CLOSED! Visual state is 'closed' — check the mechanism."
           title: "Litter Box STUCK CLOSED!"
@@ -285,7 +285,7 @@ automation:
       - action: timer.start
         target:
           entity_id: timer.litter_box_scoop_cooldown
-      - action: notify.notify_events
+      - action: notify.notify_events_cats
         data:
           message: "🧹 The litter box could use a scoop! Cleanliness: {{ states('sensor.litter_box_camera_cleanliness_score') }}%"
           title: "Litter Box Needs Scooping"