diff --git a/API/API Endpoint Health Check.yaml b/API/API Endpoint Health Check.yaml
index 1e3483f..8cc74c8 100644
--- a/API/API Endpoint Health Check.yaml	
+++ b/API/API Endpoint Health Check.yaml	
@@ -11,8 +11,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-            here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/API/Query API Endpoint.yaml b/API/Query API Endpoint.yaml
index 5ecd0dd..b8ca4fb 100644
--- a/API/Query API Endpoint.yaml	
+++ b/API/Query API Endpoint.yaml	
@@ -19,6 +19,31 @@
     ExecutionLifecycle: null
   scheduleEnabled: true
   schedules: []
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
   sequence:
     commands:
     - configuration:
diff --git a/AWS/CloudWatch Logs/Nginx Rejected Requests.yaml b/AWS/CloudWatch Logs/Nginx Rejected Requests.yaml
index 80b14ee..257ac44 100644
--- a/AWS/CloudWatch Logs/Nginx Rejected Requests.yaml	
+++ b/AWS/CloudWatch Logs/Nginx Rejected Requests.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/AWS/EC2/Retrieve Instance Status.yaml b/AWS/EC2/Retrieve Instance Status.yaml
index 5cbccab..6e96722 100644
--- a/AWS/EC2/Retrieve Instance Status.yaml	
+++ b/AWS/EC2/Retrieve Instance Status.yaml	
@@ -42,8 +42,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/AWS/ECS/Java Thread Dump from Container.yaml b/AWS/ECS/Java Thread Dump from Container.yaml
index 13c74a7..e505f3a 100644
--- a/AWS/ECS/Java Thread Dump from Container.yaml	
+++ b/AWS/ECS/Java Thread Dump from Container.yaml	
@@ -17,8 +17,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/AWS/ECS/Stopped ECS Task Errors.yaml b/AWS/ECS/Stopped ECS Task Errors.yaml
index cf2e454..e702b85 100644
--- a/AWS/ECS/Stopped ECS Task Errors.yaml	
+++ b/AWS/ECS/Stopped ECS Task Errors.yaml	
@@ -20,8 +20,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/AWS/ELB/Retrieve ELB Targets Health Status.yaml b/AWS/ELB/Retrieve ELB Targets Health Status.yaml
index 7c18e99..708832e 100644
--- a/AWS/ELB/Retrieve ELB Targets Health Status.yaml	
+++ b/AWS/ELB/Retrieve ELB Targets Health Status.yaml	
@@ -21,8 +21,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/AWS/RDS/Check Database Storage Status.yaml b/AWS/RDS/Check Database Storage Status.yaml
index af66d69..eb9c033 100644
--- a/AWS/RDS/Check Database Storage Status.yaml	
+++ b/AWS/RDS/Check Database Storage Status.yaml	
@@ -20,8 +20,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Cassandra/Check Compaction Stastics.yaml b/Cassandra/Check Compaction Stastics.yaml
index cd0a8d0..750cc36 100644
--- a/Cassandra/Check Compaction Stastics.yaml	
+++ b/Cassandra/Check Compaction Stastics.yaml	
@@ -17,8 +17,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Kafka/Describe Kafka Topic.yaml b/Kafka/Describe Kafka Topic.yaml
index 65e16c7..37608fb 100644
--- a/Kafka/Describe Kafka Topic.yaml	
+++ b/Kafka/Describe Kafka Topic.yaml	
@@ -23,8 +23,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kafka/List Kafka Topics.yaml b/Kafka/List Kafka Topics.yaml
index eed0aca..e1f1903 100644
--- a/Kafka/List Kafka Topics.yaml	
+++ b/Kafka/List Kafka Topics.yaml	
@@ -14,8 +14,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Kafka/View Topic Messages.yaml b/Kafka/View Topic Messages.yaml
index 101bd9e..2d73548 100644
--- a/Kafka/View Topic Messages.yaml	
+++ b/Kafka/View Topic Messages.yaml	
@@ -14,8 +14,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Kubernetes/Describe Deployment.yaml b/Kubernetes/Describe Deployment.yaml
index c093962..233a180 100644
--- a/Kubernetes/Describe Deployment.yaml	
+++ b/Kubernetes/Describe Deployment.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kubernetes/Describe Replicaset.yaml b/Kubernetes/Describe Replicaset.yaml
index 9c5361a..3c72455 100644
--- a/Kubernetes/Describe Replicaset.yaml	
+++ b/Kubernetes/Describe Replicaset.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kubernetes/Describe Specific Pod.yaml b/Kubernetes/Describe Specific Pod.yaml
index 4ccba0e..371615a 100644
--- a/Kubernetes/Describe Specific Pod.yaml	
+++ b/Kubernetes/Describe Specific Pod.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kubernetes/Execute Command in Pod.yaml b/Kubernetes/Execute Command in Pod.yaml
index c039d4b..7249224 100644
--- a/Kubernetes/Execute Command in Pod.yaml	
+++ b/Kubernetes/Execute Command in Pod.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kubernetes/Java Thread Dump from Kubernetes Pod.yaml b/Kubernetes/Java Thread Dump from Kubernetes Pod.yaml
index 8d6d0fe..224c587 100644
--- a/Kubernetes/Java Thread Dump from Kubernetes Pod.yaml	
+++ b/Kubernetes/Java Thread Dump from Kubernetes Pod.yaml	
@@ -11,8 +11,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kubernetes/List Recent Events.yaml b/Kubernetes/List Recent Events.yaml
index 1a3ec22..3644539 100644
--- a/Kubernetes/List Recent Events.yaml	
+++ b/Kubernetes/List Recent Events.yaml	
@@ -21,8 +21,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kubernetes/Retrieve Logs from Kubernetes by Selector Label.yaml b/Kubernetes/Retrieve Logs from Kubernetes by Selector Label.yaml
index 82197f2..5749feb 100644
--- a/Kubernetes/Retrieve Logs from Kubernetes by Selector Label.yaml	
+++ b/Kubernetes/Retrieve Logs from Kubernetes by Selector Label.yaml	
@@ -19,8 +19,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Kubernetes/Tail Logs from Individual Kubernetes Pod.yaml b/Kubernetes/Tail Logs from Individual Kubernetes Pod.yaml
index 9bd34d1..bcbfaff 100644
--- a/Kubernetes/Tail Logs from Individual Kubernetes Pod.yaml	
+++ b/Kubernetes/Tail Logs from Individual Kubernetes Pod.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   options:
diff --git a/Linux/Retrieve Errors from Syslog.yaml b/Linux/Retrieve Errors from Syslog.yaml
index 1bdea3e..ec357c3 100644
--- a/Linux/Retrieve Errors from Syslog.yaml	
+++ b/Linux/Retrieve Errors from Syslog.yaml	
@@ -18,8 +18,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Linux/Retrieve Service Status.yaml b/Linux/Retrieve Service Status.yaml
index 342a2ba..4260205 100644
--- a/Linux/Retrieve Service Status.yaml	
+++ b/Linux/Retrieve Service Status.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Linux/Top CPU & Memory Processes and Top Disk Consuming Files .yaml b/Linux/Top CPU & Memory Processes and Top Disk Consuming Files .yaml
index ba336b4..7e5ffc9 100644
--- a/Linux/Top CPU & Memory Processes and Top Disk Consuming Files .yaml	
+++ b/Linux/Top CPU & Memory Processes and Top Disk Consuming Files .yaml	
@@ -18,8 +18,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/MySQL/Conection Statistics.yaml b/MySQL/Conection Statistics.yaml
index 51a385f..b7cffed 100644
--- a/MySQL/Conection Statistics.yaml	
+++ b/MySQL/Conection Statistics.yaml	
@@ -24,6 +24,39 @@
       threadcount: '1'
     filter: .*
   nodesSelectedByDefault: true
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+  notifyAvgDurationThreshold: null
+  options:
+  - description: |-
+      ID of the PagerDuty incident that should receive the diagnostics queried from this automation.
+      This field is required to invoke this Job.
+    label: PagerDuty Incident ID
+    name: pd_incident_id
+    required: true
   plugins:
     ExecutionLifecycle: {}
   scheduleEnabled: true
diff --git a/MySQL/Current Allocated Memory By Host.yaml b/MySQL/Current Allocated Memory By Host.yaml
index 3738783..eae0bb0 100644
--- a/MySQL/Current Allocated Memory By Host.yaml	
+++ b/MySQL/Current Allocated Memory By Host.yaml	
@@ -24,6 +24,39 @@
       threadcount: '1'
     filter: .*
   nodesSelectedByDefault: true
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+  notifyAvgDurationThreshold: null
+  options:
+  - description: |-
+      ID of the PagerDuty incident that should receive the diagnostics queried from this automation.
+      This field is required to invoke this Job.
+    label: PagerDuty Incident ID
+    name: pd_incident_id
+    required: true
   plugins:
     ExecutionLifecycle: {}
   scheduleEnabled: true
diff --git a/MySQL/Hosts Summary.yaml b/MySQL/Hosts Summary.yaml
index ead3076..e5ef2ff 100644
--- a/MySQL/Hosts Summary.yaml	
+++ b/MySQL/Hosts Summary.yaml	
@@ -24,6 +24,39 @@
       threadcount: '1'
     filter: .*
   nodesSelectedByDefault: true
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+  notifyAvgDurationThreshold: null
+  options:
+  - description: |-
+      ID of the PagerDuty incident that should receive the diagnostics queried from this automation.
+      This field is required to invoke this Job.
+    label: PagerDuty Incident ID
+    name: pd_incident_id
+    required: true
   plugins:
     ExecutionLifecycle: {}
   scheduleEnabled: true
diff --git a/MySQL/Query Permormance Schema Error Log.yaml b/MySQL/Query Permormance Schema Error Log.yaml
index 4d5f34a..344cbf2 100644
--- a/MySQL/Query Permormance Schema Error Log.yaml	
+++ b/MySQL/Query Permormance Schema Error Log.yaml	
@@ -25,6 +25,39 @@
       threadcount: '1'
     filter: .*
   nodesSelectedByDefault: true
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+  notifyAvgDurationThreshold: null
+  options:
+  - description: |-
+      ID of the PagerDuty incident that should receive the diagnostics queried from this automation.
+      This field is required to invoke this Job.
+    label: PagerDuty Incident ID
+    name: pd_incident_id
+    required: true
   plugins:
     ExecutionLifecycle: {}
   scheduleEnabled: true
diff --git a/MySQL/Top 25 Tables Based On Size .yaml b/MySQL/Top 25 Tables Based On Size .yaml
index ea1517b..da33f3b 100644
--- a/MySQL/Top 25 Tables Based On Size .yaml	
+++ b/MySQL/Top 25 Tables Based On Size .yaml	
@@ -24,6 +24,39 @@
       threadcount: '1'
     filter: ${option.node_filter}
   nodesSelectedByDefault: true
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+  notifyAvgDurationThreshold: null
+  options:
+  - description: |-
+      ID of the PagerDuty incident that should receive the diagnostics queried from this automation.
+      This field is required to invoke this Job.
+    label: PagerDuty Incident ID
+    name: pd_incident_id
+    required: true
   plugins:
     ExecutionLifecycle: {}
   scheduleEnabled: true
diff --git a/Nginx/Query Nginx Status Endpoint.yaml b/Nginx/Query Nginx Status Endpoint.yaml
index 26f4038..ab86554 100644
--- a/Nginx/Query Nginx Status Endpoint.yaml	
+++ b/Nginx/Query Nginx Status Endpoint.yaml	
@@ -17,8 +17,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Nginx/Retrieve Error Logs.yaml b/Nginx/Retrieve Error Logs.yaml
index c52581d..acd487c 100644
--- a/Nginx/Retrieve Error Logs.yaml	
+++ b/Nginx/Retrieve Error Logs.yaml	
@@ -15,8 +15,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Nginx/Test Nginx Configuration.yaml b/Nginx/Test Nginx Configuration.yaml
index 619dfbc..4250099 100644
--- a/Nginx/Test Nginx Configuration.yaml	
+++ b/Nginx/Test Nginx Configuration.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/PostgreSQL/Tail PostgreSQL Log File.yaml b/PostgreSQL/Tail PostgreSQL Log File.yaml
index b10ebe4..788c0f3 100644
--- a/PostgreSQL/Tail PostgreSQL Log File.yaml	
+++ b/PostgreSQL/Tail PostgreSQL Log File.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/PostgreSQL/Test if PostgreSQL Server is Running.yaml b/PostgreSQL/Test if PostgreSQL Server is Running.yaml
index b20161a..201161f 100644
--- a/PostgreSQL/Test if PostgreSQL Server is Running.yaml	
+++ b/PostgreSQL/Test if PostgreSQL Server is Running.yaml	
@@ -20,8 +20,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/RabbitMQ/RabbitMQ Node Health.yaml b/RabbitMQ/RabbitMQ Node Health.yaml
index 8ac512b..e94a925 100644
--- a/RabbitMQ/RabbitMQ Node Health.yaml	
+++ b/RabbitMQ/RabbitMQ Node Health.yaml	
@@ -24,6 +24,39 @@
       threadcount: '1'
     filter: .*
   nodesSelectedByDefault: true
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+  notifyAvgDurationThreshold: null
+  options:
+  - description: |-
+      ID of the PagerDuty incident that should receive the diagnostics queried from this automation.
+      This field is required to invoke this Job.
+    label: PagerDuty Incident ID
+    name: pd_incident_id
+    required: true
   plugins:
     ExecutionLifecycle: {}
   scheduleEnabled: true
@@ -52,7 +85,7 @@
       nodeStep: true
       type: nixy-waitfor-sleep-workflow-node-step
     - description: Uncompress the dump to print some values in the job
-      exec: cd /var/log/rabbitmq; tar xvf ${data.output_archive}
+      exec: cd /var/log/rabbitmq && tar xvf ${data.output_archive}
     - description: Operating System related data
       plugins:
         LogFilter: []
@@ -103,7 +136,7 @@
         echo "RMQ PID Limits:"
         cat /var/log/rabbitmq/rmq/rabbitmq/rabbitmq_pid_limits
     - description: Remove Diagnostic Data Files
-      exec: rm ${data.output_archive}; rm -rf /var/log/rabbitmq/rmq; echo "All done!"
+      exec: rm ${data.output_archive} && rm -rf /var/log/rabbitmq/rmq && echo "All done!"
     keepgoing: false
     strategy: sequential
   uuid: 101f7d6f-a58a-4bfb-a548-7325978eefaf
diff --git a/Redis/Intrinsic Latency Diagnostic Test.yaml b/Redis/Intrinsic Latency Diagnostic Test.yaml
index bddd342..4178bbe 100644
--- a/Redis/Intrinsic Latency Diagnostic Test.yaml	
+++ b/Redis/Intrinsic Latency Diagnostic Test.yaml	
@@ -17,8 +17,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Redis/Query Port 6379.yaml b/Redis/Query Port 6379.yaml
index fcf5801..68c33fc 100644
--- a/Redis/Query Port 6379.yaml	
+++ b/Redis/Query Port 6379.yaml	
@@ -14,8 +14,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Redis/Redis Memory Statistics.yaml b/Redis/Redis Memory Statistics.yaml
index 1d4cd3f..e19a21c 100644
--- a/Redis/Redis Memory Statistics.yaml	
+++ b/Redis/Redis Memory Statistics.yaml	
@@ -16,8 +16,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Redis/Slow Log Entries.yaml b/Redis/Slow Log Entries.yaml
index b73cafb..169dbc8 100644
--- a/Redis/Slow Log Entries.yaml	
+++ b/Redis/Slow Log Entries.yaml	
@@ -18,8 +18,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-              here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   notifyAvgDurationThreshold: null
   nodefilters:
diff --git a/Third Party Service Disruptions.yaml b/Third Party Service Disruptions.yaml
index 84d9ea9..38746de 100644
--- a/Third Party Service Disruptions.yaml	
+++ b/Third Party Service Disruptions.yaml	
@@ -13,8 +13,25 @@
       plugin:
         configuration:
           incident_id: ${option.pd_incident_id}
-          note: 'Automated diagnostics job did not complete.  For full details, click
-                here: ${job.url}#output'
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
         type: pd-note-incident-notification
   options:
   - description: (Optional) Add a PagerDuty Incident ID to add the diagnostic output
diff --git a/Validate Integrations/PagerDuty Integration.yaml b/Validate Integrations/PagerDuty Integration.yaml
index f885882..90e13dd 100644
--- a/Validate Integrations/PagerDuty Integration.yaml	
+++ b/Validate Integrations/PagerDuty Integration.yaml	
@@ -31,6 +31,31 @@
     ExecutionLifecycle: null
   scheduleEnabled: true
   schedules: []
+  notification:
+    onfailure:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Failed for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onstart:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Started for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
+    onsuccess:
+      plugin:
+        configuration:
+          incident_id: ${option.pd_incident_id}
+          note: 'Automated Diagnostics job "${job.project}/${job.group}/${job.name}"
+            Succeeded for incident "${option.pd_incident_id}".   See the full Process Automation
+            log at: ${job.url}#output'
+        type: pd-note-incident-notification
   sequence:
     commands:
     - configuration: