diff --git a/README.md b/README.md
index da276f6..6065ec5 100644
--- a/README.md
+++ b/README.md
@@ -227,8 +227,14 @@ recorder:
       - sensor.rest980
       - camera.roomba
 ```
+### Step 13: Create Generic Camera Integration
 
-### Step 13: Enjoy!
+Create a new integration of 'Generic Camera' with the name 'Roomba' (or "Braava' if you are using mop.yaml). Set the 'Still Image URL' to the below and save the integration.
+```
+{{ states('input_text.vacuum_map') }}
+```
+
+### Step 14: Enjoy!
 
 ## Support
 
diff --git a/mop.yaml b/mop.yaml
index 2560a23..706c001 100644
--- a/mop.yaml
+++ b/mop.yaml
@@ -698,17 +698,6 @@ notify:
       platform: file
       filename: !secret mop_log
 
-###################################
-# Camera
-###################################
-
-camera:
-  - platform: generic
-    still_image_url: >-
-      {{ states('input_text.mop_map') }}
-    content_type: image/png
-    name: Braava
-
 ###################################
 # Shell Command
 ###################################
diff --git a/vacuum.yaml b/vacuum.yaml
index f0f35c6..a159ad5 100644
--- a/vacuum.yaml
+++ b/vacuum.yaml
@@ -515,9 +515,11 @@ automation:
           entity_id: sensor.vacuum
           state: 'Train'
     action:
-      - service: notify.vacuumfile
-        data_template: 
-          message: "{{ states('sensor.vacuum_location') }}"
+        - target:
+           entity_id: notify.vacuumfile
+          data:
+            message: "{{ states('sensor.vacuum_location') }}"
+          action: notify.send_message
                
   # Initialize Blank Vacuum Log File
   - alias: Vacuum Clean Log
@@ -552,9 +554,11 @@ automation:
         from: 'Pending'
         to: 'Ready'
     action:
-      - service: notify.vacuumfile
-        data_template: 
+      - target:
+          entity_id: notify.vacuumfile
+        data:
           message: "Finished"
+        action: notify.send_message
 
   # Update Vacuum Log File with Stuck Status
   - alias: Vacuum Notify on Stuck Status
@@ -563,9 +567,11 @@ automation:
       platform: template
       value_template: "{{ is_state_attr('sensor.vacuum', 'phase', 'Stuck') }}"
     action:
-      - service: notify.vacuumfile
-        data_template: 
+      - target:
+          entity_id: notify.vacuumfile
+        data:
           message: "Stuck"
+        action: notify.send_message
       # DELETE BELOW SECTION IF YOU DONT WANT NOTIFICATIONS
       - delay: 5
       - service: !secret vacuum_notify
@@ -787,17 +793,6 @@ notify:
       platform: file
       filename: !secret vacuum_log
 
-###################################
-# Camera
-###################################
-
-camera:
-  - platform: generic
-    still_image_url: >-
-      {{ states('input_text.vacuum_map') }}
-    content_type: image/png
-    name: Roomba
-
 ###################################
 # Shell Command
 ###################################