diff --git a/configuration/automations/info-leak.yaml b/configuration/automations/info-leak.yaml
index 00115ef..946f40c 100644
--- a/configuration/automations/info-leak.yaml
+++ b/configuration/automations/info-leak.yaml
@@ -32,6 +32,48 @@
               name: "default"
               critical: 1
               volume: 1.0
+    - service: notify.home_assistant
+      data:
+        message: >
+          Leak detected! ⚠️
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
+          @everyone
+        target: [ "1071801716070154240" ]
+
+- id: info-leak-cleared-notice
+  alias: '[INFO] Leak cleared notice'
+  mode: single
+  trigger:
+    - platform: state
+      entity_id: binary_sensor.coffee_machine_leak_sensor
+      to: 'off'
+    - platform: state
+      entity_id: binary_sensor.dining_plants_leak_sensor
+      to: 'off'
+    - platform: state
+      entity_id: binary_sensor.fridge_leak_sensor
+      to: 'off'
+    - platform: state
+      entity_id: binary_sensor.humidifier_leak_sensor
+      to: 'off'
+    - platform: state
+      entity_id: binary_sensor.kitchen_sink_leak_sensor
+      to: 'off'
+    - platform: state
+      entity_id: binary_sensor.washing_machine_water_leak_sensor
+      to: 'off'
+  action:
+    - service: notify.mobile_app_iphone
+      data:
+        title: "Leak cleared"
+        message: >
+          Leak cleared: {{ state_attr(trigger.entity_id, 'friendly_name') }}
+    - service: notify.home_assistant
+      data:
+        message: >
+          Leak cleared! ✅ 
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
+        target: [ "1071801716070154240" ]
 
 - id: info-smoke-notice
   alias: '[INFO] Smoke notice'
@@ -55,3 +97,33 @@
               name: "default"
               critical: 1
               volume: 1.0
+    - service: notify.home_assistant
+      data:
+        message: >
+          Smoke detected! ⚠️
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
+          @everyone
+        target: [ "1071801716070154240" ]
+
+- id: info-smoke-cleared-notice
+  alias: '[INFO] Smoke notice'
+  mode: single
+  trigger:
+    - platform: state
+      entity_id: binary_sensor.3d_printer_smoke_sensor_smoke_alarm_smoke_detected
+      to: 'off'
+    - platform: state
+      entity_id: binary_sensor.rack_smoke_sensor
+      to: 'off'
+  action:
+    - service: notify.mobile_app_iphone
+      data:
+        title: "Smoke cleared"
+        message: >
+          Smoke cleared: {{ state_attr(trigger.entity_id, 'friendly_name') }}
+    - service: notify.home_assistant
+      data:
+        message: >
+          Smoke cleared! ✅
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
+        target: [ "1071801716070154240" ]