diff --git a/configuration/automations/3d-printer-mini.yaml b/configuration/automations/3d-printer-mini.yaml
index 0fa3c3e..78aa941 100644
--- a/configuration/automations/3d-printer-mini.yaml
+++ b/configuration/automations/3d-printer-mini.yaml
@@ -1,11 +1,15 @@
-- id: 3dprinter_mini_notify
-  alias: '[3D Printer][Prusa Mini] Notify finished'
+- id: prusa_mini_notify
+  alias: '[Prusa Mini] Notify finished'
   mode: single
   trigger:
     - platform: state
       entity_id: sensor.prusamini
       from: printing
       to: idle
+    - platform: state
+      entity_id: sensor.prusamini
+      from: printing
+      to: finished
   action:
     - service: notify.mobile_app_iphone
       data:
@@ -14,32 +18,14 @@
         data:
           url: "/lovelace-tablet/3d-printer"
 
-- id: 3dprinter_mini_pause_notify
-  alias: '[3D Printer][Prusa Mini] Notify paused print'
-  mode: single
-  trigger:
-    - platform: state
-      entity_id: sensor.prusamini_nozzle_temperature
-      to: "0"
-  condition:
-    - condition: numeric_state
-      entity_id: sensor.prusamini_heatbed_target_temperature
-      above: 0
-  action:
-    - service: notify.mobile_app_iphone
-      data:
-        title: Prusa Mini
-        message: 3D Print has been paused
-        data:
-          url: "/lovelace-tablet/3d-printer"
-
-- id: 3dprinter_pause_notify_2
-  alias: '[3D Printer] Notify about paused print (test)'
+- id: prusa_mini_pause_notify
+  alias: '[Prusa Mini] Notify paused print'
   mode: single
   trigger:
     - platform: state
       entity_id: sensor.prusamini
-      to: "Paused"
+      from: printing
+      to: paused
   action:
     - service: notify.mobile_app_iphone
       data:
diff --git a/configuration/automations/3d-printer.yaml b/configuration/automations/3d-printer.yaml
index bd7a3d7..0af925c 100644
--- a/configuration/automations/3d-printer.yaml
+++ b/configuration/automations/3d-printer.yaml
@@ -1,11 +1,11 @@
-- id: 3dprinter_off
-  alias: '[3D Printer] Turn off'
+- id: prusa_mk39_off
+  alias: '[Prusa MK3.9] Turn off'
   mode: single
   trigger:
     - platform: numeric_state
       entity_id: sensor.3d_printer_electric_consumption_w
       below: 30
-      for: '00:30:00'
+      for: '00:15:00'
   condition:
     - condition: or
       conditions:
@@ -50,14 +50,14 @@
           images:
             - "/config/www/cctv/3d_printer.jpg"
 
-- id: 3dprinter_notify
-  alias: '[3D Printer] Notify'
+- id: prusa_mk39_notify_finished
+  alias: '[Prusa MK3.9] Notify Finished'
   mode: single
   trigger:
     - platform: state
       entity_id: sensor.prusa_mk39
       from: printing
-      to: idle
+      to: finished
   action:
     - service: notify.mobile_app_iphone
       data:
@@ -78,8 +78,8 @@
           images:
             - "/config/www/cctv/3d_printer.jpg"
 
-- id: 3dprinter_button
-  alias: '[3D Printer] button'
+- id: prusa_mk39_button
+  alias: '[Prusa MK3.9] button'
   mode: single
   trigger:
     - device_id: a2ac0fa69738b8e7c5c1b8b8bcf8cdc2
@@ -153,33 +153,14 @@
       target:
         entity_id: switch.3d_printer_enclosure_fan_on_off
 
-- id: 3dprinter_pause_notify
-  alias: '[3D Printer] Notify about paused print'
-  mode: single
-  trigger:
-    - platform: state
-      entity_id: sensor.prusa_mk39_nozzle_target_temperature
-      to: "0"
-  condition:
-    - condition: numeric_state
-      entity_id: sensor.prusa_mk39_heatbed_target_temperature
-      above: 0
-  action:
-    - service: notify.mobile_app_iphone
-      data:
-        title: Prusa MK3.9
-        message: 3D Print has been paused
-        data:
-          entity_id: camera.3d_printer
-          url: "/lovelace-tablet/3d-printer"
-
-- id: 3dprinter_pause_notify_2
-  alias: '[3D Printer] Notify about paused print (test)'
+- id: prusa_mk39_pause_notify
+  alias: '[Prusa MK3.9] Notify about paused print'
   mode: single
   trigger:
     - platform: state
       entity_id: sensor.prusa_mk39
-      to: "Paused"
+      from: printing
+      to: paused
   action:
     - service: notify.mobile_app_iphone
       data: