diff --git a/automations.yaml b/automations.yaml
index 4ea0ca9..04a3e80 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -3508,4 +3508,49 @@
       at: '15:00:00'
   action:
     - service : switch.turn_off
-      entity_id: switch.smartplug7
\ No newline at end of file
+      entity_id: switch.smartplug7
+
+
+# Alert when the washing machine has completed its job
+- id: alertwashingmachinecompleted
+  alias: Alert when the washing machine has completed its job
+  initial_state: True
+  trigger:
+    - platform: state
+      entity_id: sensor.fcb97e3fb7af_laundry_machine_state
+      from: 'Run'
+      to: 'Finished'
+  condition:
+    condition: and
+    conditions: 
+      - condition: state
+        entity_id: input_boolean.laundry_washer_dryer_notification
+        state: 'on'
+  action:
+    - service: notify.phoneapps
+      data_template:
+        title: '🧺 👕 Washing machine job completed! 🎉'
+        message:  'Washing machine job completed on {{now().strftime("%Y%m%d-%H%M%S")}}'
+
+
+
+# Alert when the dryer has completed its job
+- id: alertdryermachinecompleted
+  alias: Alert when the dryer has completed its job
+  initial_state: True
+  trigger:
+    - platform: state
+      entity_id: sensor.d828c9f3fc0c_laundry_machine_state
+      from: 'Run'
+      to: 'Stand'
+  condition:
+    condition: and
+    conditions: 
+      - condition: state
+        entity_id: input_boolean.laundry_washer_dryer_notification
+        state: 'on'
+  action:
+    - service: notify.phoneapps
+      data_template:
+        title: '👚💨 🧺 Dryer job completed ! 🎉'
+        message:  'Dryer job completed on {{now().strftime("%Y%m%d-%H%M%S")}}'
diff --git a/input_boolean.yaml b/input_boolean.yaml
index 4718e28..b8d8d04 100644
--- a/input_boolean.yaml
+++ b/input_boolean.yaml
@@ -179,4 +179,7 @@ frontentrance_light_auto_off_with_frontdoor:
   name: Turn off Front Entrance light after sometime with Front door open. 
 
 christmas_lights_auto:
-  name: Outdoor Christmas Lights Automation
\ No newline at end of file
+  name: Outdoor Christmas Lights Automation
+
+laundry_washer_dryer_notification:
+  name: Send Notifications when washer or dryer complete jobs
\ No newline at end of file
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 79f51c7..caee59a 100755
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -1451,6 +1451,9 @@ views:
             - entity: input_boolean.hallway_light_on_off_auto
               tap_action:
                 action: toggle
+            - entity: input_boolean.laundry_washer_dryer_notification
+              tap_action:
+                action: toggle
         - type: entities
           title: Office Room
           entities:
@@ -1546,40 +1549,40 @@ views:
             title: Washing Machine
             elements:
               - type: image
-                entity: sensor.washer_run_state
+                entity: sensor.fcb97e3fb7af_laundry_sub_cycle
                 image: /local/custom-lovelace/icons/laundry-icons/sensing.png
                 state_image:
-                  Detecting: /local/custom-lovelace/icons/laundry-icons/sensing-on.png
+                  'Load Size Detection': /local/custom-lovelace/icons/laundry-icons/sensing-on.png
                 style:
                   top: 33%
                   left: 39%
                   width: 15%
                   image-rendering: crisp
               - type: image
-                entity: sensor.washer_run_state
+                entity: sensor.fcb97e3fb7af_laundry_sub_cycle
                 image: /local/custom-lovelace/icons/laundry-icons/wash.png
                 state_image:
-                  Washing: /local/custom-lovelace/icons/laundry-icons/wash-on.png
+                  Wash: /local/custom-lovelace/icons/laundry-icons/wash-on.png
                 style:
                   top: 33%
                   left: 55%
                   width: 15%
                   image-rendering: crisp
               - type: image
-                entity: sensor.washer_run_state
+                entity: sensor.fcb97e3fb7af_laundry_sub_cycle
                 image: /local/custom-lovelace/icons/laundry-icons/rinse.png
                 state_image:
-                  Rinsing: /local/custom-lovelace/icons/laundry-icons/rinse-on.png
+                  Rinse: /local/custom-lovelace/icons/laundry-icons/rinse-on.png
                 style:
                   top: 33%
                   left: 71%
                   width: 15%
                   image-rendering: crisp
               - type: image
-                entity: sensor.washer_run_state
+                entity: sensor.fcb97e3fb7af_laundry_sub_cycle
                 image: /local/custom-lovelace/icons/laundry-icons/spin.png
                 state_image:
-                  Spinning: /local/custom-lovelace/icons/laundry-icons/spin-on.png
+                  Spin: /local/custom-lovelace/icons/laundry-icons/spin-on.png
                 style:
                   top: 33%
                   left: 87%
@@ -1666,7 +1669,7 @@ views:
               entity: sensor.d828c9f3fc0c_laundry_sub_cycle
               image: /local/custom-lovelace/icons/laundry-icons/cool.png
               state_image:
-                Cooling: /local/custom-lovelace/icons/laundry-icons/cool-on.png
+                'Cool Down': /local/custom-lovelace/icons/laundry-icons/cool-on.png
               style:
                 top: 33%
                 left: 87%