diff --git a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml
index 0cdbbc12b..ec4737bd8 100644
--- a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml
+++ b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_Template.class/__class__.yaml
@@ -178,7 +178,7 @@ object:
       datatype: string
       priority: 9
       owner: 
-      default_value: "/Infrastructure/VM/Provisioning/Email/MiqProvision_complete?event=template_provisioned"
+      default_value: "/System/Notification/Email/InfrastructureMiqProvisionComplete?event=template_provisioned"
       substitute: true
       message: create
       visibility: 
diff --git a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml
index 5f655e0c6..c5a7a56a7 100644
--- a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml
+++ b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/__class__.yaml
@@ -278,7 +278,7 @@ object:
       datatype: string
       priority: 14
       owner: 
-      default_value: "/Infrastructure/VM/Provisioning/Email/MiqProvision_Complete?event=vm_provisioned"
+      default_value: "/System/Notification/Email/InfrastructureMiqProvisionComplete?event=vm_provisioned"
       substitute: true
       message: create
       visibility: 
diff --git a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/clone_to_vm.yaml b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/clone_to_vm.yaml
index 36a0289f5..beb9dae07 100644
--- a/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/clone_to_vm.yaml
+++ b/content/automate/ManageIQ/Infrastructure/VM/Provisioning/StateMachines/VMProvision_VM.class/clone_to_vm.yaml
@@ -11,4 +11,4 @@ object:
   - PreProvision:
       value: "/Infrastructure/VM/Provisioning/StateMachines/Methods/PreProvision_Clone_to_VM#${/#miq_provision.source.vendor}"
   - EmailOwner:
-      value: "/Infrastructure/VM/Provisioning/Email/MiqProvision_Complete?event=vm_cloned"
+      value: "/System/Notification/Email/InfrastructureMiqProvisionComplete?event=vm_cloned"
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisioncomplete.yaml b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisioncomplete.yaml
new file mode 100644
index 000000000..1c8a5d4c3
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisioncomplete.yaml
@@ -0,0 +1,18 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureMiqProvisionComplete
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_provision.miq_request.get_option(:owner_email)} || ${/#miq_provision.miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - subject:
+      value: 'Request ID ${/#miq_provision.miq_request.id} - Your Virtual Machine
+        Request has Completed - Vm Name: <${/#miq_provision.vm.name}>'
+  - customize:
+      value: miq_provision_customize_body
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverapproved.yaml b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverapproved.yaml
new file mode 100644
index 000000000..e08c64723
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverapproved.yaml
@@ -0,0 +1,18 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureMiqProvisionRequestApproverApproved
+    inherits: 
+    description: 
+  fields:
+  - subject:
+      value: Request ID ${/#miq_request.id} - Virtual Machine Request from <${/#miq_request.requester.email}>
+        was Approved, pending Quota Validation.
+  - body:
+      value: 'Approver, <br><br>A Virtual Machine Request received from ${/#miq_request.requester.email}
+        was Approved.<br><br>Approvers reason: ${/#miq_request.reason}<br><br>To view
+        this Request go to: <a href=${/#miq_request.show_url}>${/#miq_request.show_url}</a><br><br>
+        Thank you,<br> ${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverdenied.yaml b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverdenied.yaml
new file mode 100644
index 000000000..014fce5e4
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverdenied.yaml
@@ -0,0 +1,18 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureMiqProvisionRequestApproverDenied
+    inherits: 
+    description: 
+  fields:
+  - subject:
+      value: Request ID ${/#miq_request.id} - Virtual Machine Request from <${/#miq_request.requester.email}>
+        was Denied.
+  - body:
+      value: 'Approver, <br><br>A Virtual Machine Request received from ${/#miq_request.requester.email}
+        was Denied.<br><br>${/#miq_request.resource.message}.<br><br>Approvers notes:
+        ${/#miq_request.reason}<br><br>For more information you can go to: <a href=${/#miq_request.show_url}>${/#miq_request.show_url}</a><br><br>
+        Thank you,<br> ${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverpending.yaml b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverpending.yaml
new file mode 100644
index 000000000..dc76bcfce
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestapproverpending.yaml
@@ -0,0 +1,18 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureMiqProvisionRequestApproverPending
+    inherits: 
+    description: 
+  fields:
+  - subject:
+      value: Request ID ${/#miq_request.id} - Virtual Machine Request from <${/#miq_request.requester.email}>
+        Pending Approval.
+  - body:
+      value: 'Approver, <br><br>A Virtual Machine Request received from ${/#miq_request.requester.email}
+        is Pending.<br><br>${/#miq_request.resource.message}.<br><br>Approvers notes:
+        ${/#miq_request.reason}<br><br>For more information you can go to: <a href=${/#miq_request.show_url}>${/#miq_request.show_url}</a><br><br>
+        Thank you,<br> ${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterapproved.yaml b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterapproved.yaml
new file mode 100644
index 000000000..8ff4404f5
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterapproved.yaml
@@ -0,0 +1,21 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureMiqProvisionRequestRequesterApproved
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - subject:
+      value: Request ID ${/#miq_request.id} - Your Virtual Machine Request was Approved,
+        pending Quota Validation.
+  - body:
+      value: 'Hello ${/#user.name},<br><br>Your Virtual Machine Request was Approved.
+        If Quota validation is successful you will be notified via email when the
+        host is available.<br><br>To view this Request go to: <a href=${/#miq_request.show_url}>${/#miq_request.show_url}</a><br><br>
+        Thank you,<br> ${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterdenied.yaml b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterdenied.yaml
new file mode 100644
index 000000000..e9854c540
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterdenied.yaml
@@ -0,0 +1,20 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureMiqProvisionRequestRequesterDenied
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - subject:
+      value: Request ID ${/#miq_request.id} - Your Virtual Machine Request was Denied.
+  - body:
+      value: 'Hello,<br><br>Your Virtual Machine Request was Denied.<br><br>${/#miq_request.resource.message}.<br><br>Approvers
+        notes: ${/#miq_request.reason}<br><br>For more information you can go to:
+        <a href=${/#miq_request.show_url}>${/#miq_request.show_url}</a><br><br> Thank
+        you,<br> ${#signature}'
diff --git a/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterpending.yaml b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterpending.yaml
new file mode 100644
index 000000000..ff83017c8
--- /dev/null
+++ b/content/automate/ManageIQ/System/Notification/Email.class/infrastructuremiqprovisionrequestrequesterpending.yaml
@@ -0,0 +1,19 @@
+---
+object_type: instance
+version: 1.0
+object:
+  attributes:
+    display_name: 
+    name: InfrastructureMiqProvisionRequestRequesterPending
+    inherits: 
+    description: 
+  fields:
+  - to:
+      value: "${/#miq_request.get_option(:owner_email)} || ${/#miq_request.requester.email}
+        || ${/Configuration/Email/Default#default_recipient}"
+  - subject:
+      value: Request ID ${/#miq_request.id} - Your Virtual Machine Request is Pending.
+  - body:
+      value: 'Hello,<br><br>Please review your Virtual Machine Request and wait for
+        approval from an Administrator.<br><br>To view this Request go to: <a href=${/#miq_request.show_url}>${/#miq_request.show_url}</a><br><br>
+        Thank you,<br> ${#signature}'