diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7410773..c9d3b84 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,6 +99,9 @@ jobs:
 
           echo "ECR Docker build business with tag ${NEW_VERSION}"
           mvn clean package -Pbuild-business -B docker:tag -Ddocker.image.tag=${NEW_VERSION} -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+          
+          echo "ECR Docker build oneruntime with tag ${NEW_VERSION}"
+          mvn clean package -Pbuild-oneruntime -B docker:tag -Ddocker.image.tag=${NEW_VERSION} -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
       ##
       #
@@ -113,6 +116,9 @@ jobs:
 #
 #          echo "ECR Docker push business with tag ${NEW_VERSION}"
 #          mvn clean package -Ppush-business -Ddocker.skip.extendedAuth=true -Ddocker.push.username=${{ steps.ecr-credentials.outputs.username }} -Ddocker.push.password=${{ steps.ecr-credentials.outputs.password }} -B docker:tag -Ddocker.image.tag=${NEW_VERSION} -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+#
+#          echo "ECR Docker push oneruntime with tag ${NEW_VERSION}"
+#          mvn clean package -Ppush-oneruntime -Ddocker.skip.extendedAuth=true -Ddocker.push.username=${{ steps.ecr-credentials.outputs.username }} -Ddocker.push.password=${{ steps.ecr-credentials.outputs.password }} -B docker:tag -Ddocker.image.tag=${NEW_VERSION} -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
       - name: Commit files
         if: "contains(github.ref, 'master') || contains(github.ref, 'support/')"
diff --git a/README.md b/README.md
index 2c05149..5556e21 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,22 @@ This repository has the following structure:
              │    │   └── repository.xml                        # A repository definitions
              │    └── ...
              └── ...
+    └── oneruntime                                              # Oeruntime collection
+        └── general-notifications                               # General notifications related collection
+            └── event-general-notifications     
+                ├── {event-general-notifications-name}              
+                │   ├── {general-notification-name}             # The folder to store channel specific data for general notifications.  
+                │   │   ├── in-app-notification                         
+                │   │   │   ├── {locale}                        # The folder to store locale-specific engagement templates
+                │   │   │   │   └── engagement-template.json    # The engagement template that contains default messages with the Handlebars expressions
+                │   │   │   └── in-app_channel-settings.json    # The channel settings for in-app notification channels per locale
+                │   │   └── push
+                │   │       ├── {locale} 
+                │   │       │   └── engagement-template.json 
+                │   │       └── in-app_channel-settings.json     
+                │   └── event-general-notifications.json        # The event with one or more general-notification definitions
+                └── ... 
+
 ```
 
 ### Repository definition configuration
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/email/email_channel-settings.json
new file mode 100644
index 0000000..12b303c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+    "from": "engage-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/email/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/email/en_US/engagement-template.json
new file mode 100644
index 0000000..c2316e8
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/email/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "subject": "Account balance changed (business)",
+  "body": "Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..cb2d6da
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Account balance changed (business)",
+  "body": "💸 Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..21ec51b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "Accounts"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/push/en_US/engagement-template.json
new file mode 100644
index 0000000..5058259
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Account balance changed (business)",
+  "body": "\uD83D\uDCB8 Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/push/push_channel-settings.json
new file mode 100644
index 0000000..e2a501b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-business",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "ACCOUNT_BALANCE_LOW_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/sms/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/sms/en_US/engagement-template.json
new file mode 100644
index 0000000..9c4d900
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/sms/en_US/engagement-template.json
@@ -0,0 +1,3 @@
+{
+    "message": "Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/sms/sms_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/sms/sms_channel-settings.json
new file mode 100644
index 0000000..c33502e
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-business/sms/sms_channel-settings.json
@@ -0,0 +1,3 @@
+{
+    "from": "BACKBASE"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/email/email_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/email/email_channel-settings.json
new file mode 100644
index 0000000..12b303c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/email/email_channel-settings.json
@@ -0,0 +1,3 @@
+{
+    "from": "engage-qa@backbase.com"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/email/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/email/en_US/engagement-template.json
new file mode 100644
index 0000000..58cb16f
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/email/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "subject": "Account balance changed (retail)",
+  "body": "Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..5aaa489
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Account balance changed (retail)",
+  "body": "💸 Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..21ec51b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "Accounts"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/push/en_US/engagement-template.json
new file mode 100644
index 0000000..b6d8f56
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Account balance changed (retail)",
+  "body": "\uD83D\uDCB8 Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/push/push_channel-settings.json
new file mode 100644
index 0000000..f44a882
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-retail",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "ACCOUNT_BALANCE_LOW_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/sms/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/sms/en_US/engagement-template.json
new file mode 100644
index 0000000..9c4d900
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/sms/en_US/engagement-template.json
@@ -0,0 +1,3 @@
+{
+    "message": "Hi {{{user.preferredName}}}, your {{{event.alias}}} balance just went below threshold. The current balance is {{formatAmount event.currentBalance locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/sms/sms_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/sms/sms_channel-settings.json
new file mode 100644
index 0000000..c33502e
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/account-balance-low-retail/sms/sms_channel-settings.json
@@ -0,0 +1,3 @@
+{
+    "from": "BACKBASE"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/event-general-notifications.json
new file mode 100644
index 0000000..e294c29
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/account-balance-changed/event-general-notifications.json
@@ -0,0 +1,145 @@
+{
+  "eventClassName": "com.backbase.dbs.actions.reactive.event.spec.v2.AccountBalanceChangedEvent",
+  "id": "account-balance-changed",
+  "eventBusinessName": "Account Balance Changed",
+  "recipientType": "subscription",
+  "extractor": "#this['arrangementId']",
+  "subscriptionType": "arrangement",
+  "serviceAgreementExtractor": "#this['serviceAgreementId']",
+  "generalNotifications": [
+    {
+      "id": "account-balance-low",
+      "name": "Account Balance Low Retail",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "T(java.lang.Double).valueOf(#triggeredEvent['currentBalance']) < #userConditions['amount'] && T(java.lang.Double).valueOf(#triggeredEvent['previousBalance']) >= #userConditions['amount']",
+      "userPreferenceDefaults": "{\"amount\":0}",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/account-balance-low-retail/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "arrangement-view",
+            "data": "{\"id\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-retail/in-app-notification/en_US/engagement-template.json",
+              "templateName": "account-balance-low-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/account-balance-low-retail/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "arrangement-view",
+            "data": "{\"id\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-retail/push/en_US/engagement-template.json",
+              "templateName": "account-balance-low-push",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "sms",
+          "channelSettings": "/account-balance-low-retail/sms/sms_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-retail/sms/en_US/engagement-template.json",
+              "templateName": "account-balance-low-sms",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "email",
+          "channelSettings": "/account-balance-low-retail/email/email_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-retail/email/en_US/engagement-template.json",
+              "templateName": "account-balance-low-email",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "account-balance-low-business",
+      "name": "Account Balance Low Business",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "T(java.lang.Double).valueOf(#triggeredEvent['currentBalance']) < #userConditions['amount'] && T(java.lang.Double).valueOf(#triggeredEvent['previousBalance']) >= #userConditions['amount']",
+      "userPreferenceDefaults": "{\"amount\":0}",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/account-balance-low-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "arrangement-view",
+            "data": "{\"id\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-business/in-app-notification/en_US/engagement-template.json",
+              "templateName": "account-balance-low-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/account-balance-low-business/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "arrangement-view",
+            "data": "{\"id\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-business/push/en_US/engagement-template.json",
+              "templateName": "account-balance-low-push",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "sms",
+          "channelSettings": "/account-balance-low-business/sms/sms_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-business/sms/en_US/engagement-template.json",
+              "templateName": "account-balance-low-sms",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "email",
+          "channelSettings": "/account-balance-low-business/email/email_channel-settings.json",
+          "isEnabledByDefault": false,
+          "engagementTemplates": [
+            {
+              "path": "/account-balance-low-business/email/en_US/engagement-template.json",
+              "templateName": "account-balance-low-email",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-failed/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-failed/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..ebf539a
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-failed/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Export failed",
+  "body": "The CSV you requested for export failed to complete"
+}
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-failed/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-failed/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..fa02d2e
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-failed/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "ALERT",
+  "targetGroup": "USER",
+  "origin": "Audit"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-ready/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-ready/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..42dec4e
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-ready/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Export complete",
+  "body": "The CSV you requested for export is complete and ready to download"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-ready/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-ready/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..9fa7c3b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/audit-export-ready/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "SUCCESS",
+  "targetGroup": "USER",
+  "origin": "Audit"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/event-general-notifications.json
new file mode 100644
index 0000000..d062a87
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/audit-export-completed/event-general-notifications.json
@@ -0,0 +1,56 @@
+{
+  "eventClassName": "com.backbase.audit.persistence.event.spec.v1.AuditExportCompletedEvent",
+  "id": "audit-export-completed",
+  "eventBusinessName": "Audit Export Completed",
+  "recipientType": "internal",
+  "extractor": "#this['userId']",
+  "serviceAgreementExtractor": "#this['serviceAgreement']",
+  "generalNotifications": [
+    {
+      "id": "audit-export-ready",
+      "name": "Audit Export Ready",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['status'] == 'successful'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "audit-export-ready/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "audit-download-view",
+            "data": "{\"link\":\"{{{event.link}}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/audit-export-ready/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "audit-export-failed",
+      "name": "Audit Export Failed",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['status'] == 'failed'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "audit-export-failed/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "engagementTemplates": [
+            {
+              "path": "/audit-export-failed/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/batch-status-updated/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/batch-status-updated/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..db2f887
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/batch-status-updated/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "{{#eq event.status 'REJECTED' }}Batch rejected{{else}}Batch contains rejected {{#eq event.rejectedTransactionsCount 1 }}transfer{{else}}transfers{{/eq}}{{/eq}}",
+  "body": "Hi {{{user.preferredName}}}, your batch {{event.name}} of {{event.totalInstructedAmount.currencyCode}} {{formatAmount event.totalInstructedAmount.amount locale}}{{#eq event.status 'REJECTED' }} has changed to rejected{{else}} contains {{event.rejectedTransactionsCount}} rejected {{#eq event.rejectedTransactionsCount 1 }}transfer{{else}}transfers{{/eq}}{{/eq}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/batch-status-updated/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/batch-status-updated/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..899fa5b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/batch-status-updated/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "PaymentBatch"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/event-general-notifications.json
new file mode 100644
index 0000000..4267605
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/batch-status-updated/event-general-notifications.json
@@ -0,0 +1,36 @@
+{
+  "eventClassName": "com.backbase.paymentbatch.event.spec.v1.BatchOrderStatusUpdatedEvent",
+  "id": "batch-status-updated",
+  "eventBusinessName": "Batch Status Updated",
+  "recipientType": "internal",
+  "extractor": "#this['internalUserId']",
+  "serviceAgreementExtractor": "#this['serviceAgreementId']",
+  "generalNotifications": [
+    {
+      "id": "batch-status-updated",
+      "name": "Batch Status Updated",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['status'] == 'REJECTED' || (#triggeredEvent['status'] == 'PROCESSED' && #triggeredEvent['rejectedTransactionsCount'] >= 1)",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/batch-status-updated/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "batch-view",
+            "data": "{\"id\":\"{{event.id}}\",\"batchType\":\"{{event.type}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/batch-status-updated/in-app-notification/en_US/engagement-template.json",
+              "templateName": "batch-status-updated-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..322dbca
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Contact status change",
+  "body": "Hi {{{user.preferredName}}}, the status for Contact: {{{event.party.name}}} has changed to {{lower event.party.status}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..e592b3b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "Contact"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/push/en_US/engagement-template.json
new file mode 100644
index 0000000..322dbca
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Contact status change",
+  "body": "Hi {{{user.preferredName}}}, the status for Contact: {{{event.party.name}}} has changed to {{lower event.party.status}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/push/push_channel-settings.json
new file mode 100644
index 0000000..80e2ca7
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/contact-status-updated-rejected/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-business",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "CONTACT_STATUS_UPDATED_REJECTED_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/event-general-notifications.json
new file mode 100644
index 0000000..4180ced
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/contact-status-updated/event-general-notifications.json
@@ -0,0 +1,52 @@
+{
+  "eventClassName": "com.backbase.party.persistence.event.spec.v1.PartyUpdatedEvent",
+  "id": "party-updated",
+  "eventBusinessName": "Party Updated",
+  "recipientType": "internal",
+  "extractor": "#this['party']['internalUserId']",
+  "serviceAgreementExtractor": "#this['party']['serviceAgreementId']",
+  "generalNotifications": [
+    {
+      "id": "contact-status-updated-rejected",
+      "name": "Contact Status Updated (Rejected)",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['party']['status'] == 'REJECTED'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/contact-status-updated-rejected/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "party-view",
+            "data": "{\"id\": \"{{event.party.id}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/contact-status-updated-rejected/in-app-notification/en_US/engagement-template.json",
+              "templateName": "contact-status-updated-rejected-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/contact-status-updated-rejected/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "party-view",
+            "data": "{\"id\": \"{{event.party.id}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/contact-status-updated-rejected/push/en_US/engagement-template.json",
+              "templateName": "contact-status-updated-rejected-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/event-general-notifications.json
new file mode 100644
index 0000000..83cffb7
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/event-general-notifications.json
@@ -0,0 +1,95 @@
+{
+  "eventClassName": "com.backbase.dbs.messages.pandp.event.spec.v4.MessageReceivedEvent",
+  "id": "message-received",
+  "eventBusinessName": "Message Received",
+  "recipientType": "internal",
+  "extractor": "#this['recipient']",
+  "generalNotifications": [
+    {
+      "id": "new-message-received",
+      "name": "New Message Received Retail",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'RETAIL' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/new-message-received-retail/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-message-received-retail/in-app-notification/en_US/engagement-template.json",
+              "templateName": "new-message-received-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/new-message-received-retail/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-message-received-retail/push/en_US/engagement-template.json",
+              "templateName": "new-message-received-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "new-message-received-business",
+      "name": "New Message Received Business",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "additionalFilterLogic": "#lineOfBusiness != null ? #lineOfBusiness == 'BUSINESS' : true",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/new-message-received-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-message-received-business/in-app-notification/en_US/engagement-template.json",
+              "templateName": "new-message-received-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/new-message-received-business/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-message-received-business/push/en_US/engagement-template.json",
+              "templateName": "new-message-received-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..8989787
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message (business)",
+  "body": "From: {{{event.sender}}} <br/>Subject: {{{event.subject}}} <br/>Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..b5bc6be
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "MessageCenter"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/push/en_US/engagement-template.json
new file mode 100644
index 0000000..c667ff9
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message (business)",
+  "body": "From: {{{event.sender}}} Subject: {{{event.subject}}} Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/push/push_channel-settings.json
new file mode 100644
index 0000000..c6ae4b2
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-business/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-business",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "NEW_MESSAGE_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..78157c4
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message (retail)",
+  "body": "From: {{{event.sender}}} <br/>Subject: {{{event.subject}}} <br/>Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..b5bc6be
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "MessageCenter"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/push/en_US/engagement-template.json
new file mode 100644
index 0000000..3cc8c07
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message (retail)",
+  "body": "From: {{{event.sender}}} Subject: {{{event.subject}}} Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/push/push_channel-settings.json
new file mode 100644
index 0000000..faf8818
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/message-received/new-message-received-retail/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-retail",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "NEW_MESSAGE_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/event-general-notifications.json
new file mode 100644
index 0000000..b6fa63c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/event-general-notifications.json
@@ -0,0 +1,33 @@
+{
+  "eventClassName": "com.backbase.dbs.messages.pandp.event.spec.v4.NewMsgInAssignedConversationEvent",
+  "id": "new-message-in-assigned-conversation",
+  "eventBusinessName": "New Message In Assigned Conversation",
+  "recipientType": "internal",
+  "extractor": "#this['messageThreadAssignee']",
+  "generalNotifications": [
+    {
+      "id": "new-message-in-assigned-conversation",
+      "name": "New Message In Assigned Conversation",
+      "userPreferenceEnabled": false,
+      "manageable": false,
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "new-message-in-assigned-conversation/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-message-in-assigned-conversation/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/new-message-in-assigned-conversation/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/new-message-in-assigned-conversation/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..1d2014c
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/new-message-in-assigned-conversation/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message",
+  "body": "From: {{{event.senderName}}}<br/>Subject: {{{event.subject}}}<br/>Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/new-message-in-assigned-conversation/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/new-message-in-assigned-conversation/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..b5bc6be
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/new-message-in-assigned-conversation/new-message-in-assigned-conversation/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "MessageCenter"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/event-general-notifications.json
new file mode 100644
index 0000000..1795496
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/event-general-notifications.json
@@ -0,0 +1,33 @@
+{
+  "eventClassName": "com.backbase.dbs.messages.pandp.event.spec.v4.NewUnassignedConversationEvent",
+  "id": "new-unassigned-conversation",
+  "eventBusinessName": "New Unassigned Conversation",
+  "recipientType": "internal",
+  "extractor": "#this['topicSubscribers']",
+  "generalNotifications": [
+    {
+      "id": "new-unassigned-conversation",
+      "name": "New Unassigned Conversation",
+      "manageable": false,
+      "userPreferenceEnabled": false,
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/new-unassigned-conversation/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "conversation-view",
+            "data": "{\"id\":\"{{event.conversationId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-unassigned-conversation/in-app-notification/en_US/engagement-template.json",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/new-unassigned-conversation/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/new-unassigned-conversation/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..8e04785
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/new-unassigned-conversation/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New message - Unassigned",
+  "body": "From: {{{event.senderName}}}<br/>Subject: {{{event.subject}}}<br/>Topic: {{{event.topicName}}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/new-unassigned-conversation/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/new-unassigned-conversation/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..b5bc6be
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/new-unassigned-conversation/new-unassigned-conversation/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "MessageCenter"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/event-general-notifications.json
new file mode 100644
index 0000000..24d096f
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/event-general-notifications.json
@@ -0,0 +1,52 @@
+{
+  "eventClassName": "com.backbase.payment.event.spec.v1.PaymentOrderUpdatedEvent",
+  "id": "payment-order-updated",
+  "eventBusinessName": "Payment Order Updated",
+  "recipientType": "internal",
+  "extractor": "#this['paymentOrder']['internalUserId']",
+  "serviceAgreementExtractor": "#this['paymentOrder']['serviceAgreementId']",
+  "generalNotifications": [
+    {
+      "id": "payment-status-updated-rejected",
+      "name": "Payment Status Updated (Rejected)",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['paymentOrder']['status'] == 'REJECTED'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/payment-status-updated-rejected/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "payment-view",
+            "data": "{\"id\": \"{{event.paymentOrder.id}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/payment-status-updated-rejected/in-app-notification/en_US/engagement-template.json",
+              "templateName": "payment-status-updated-rejected-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/payment-status-updated-rejected/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "payment-view",
+            "data": "{\"id\": \"{{event.paymentOrder.id}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/payment-status-updated-rejected/push/en_US/engagement-template.json",
+              "templateName": "payment-status-updated-rejected-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..a7da1ed
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Payment status change",
+  "body": "Hi {{{user.preferredName}}}, your payment to {{{event.paymentOrder.transferTransactionInformation.counterparty.name}}} of {{{event.paymentOrder.totalAmount.currencyCode}}} {{formatAmount event.paymentOrder.totalAmount.amount locale}} has changed to {{lower event.paymentOrder.status}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..860b2e9
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "Payment"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/push/en_US/engagement-template.json
new file mode 100644
index 0000000..a7da1ed
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Payment status change",
+  "body": "Hi {{{user.preferredName}}}, your payment to {{{event.paymentOrder.transferTransactionInformation.counterparty.name}}} of {{{event.paymentOrder.totalAmount.currencyCode}}} {{formatAmount event.paymentOrder.totalAmount.amount locale}} has changed to {{lower event.paymentOrder.status}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/push/push_channel-settings.json
new file mode 100644
index 0000000..8484cf7
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/payment-order-updated/payment-status-updated-rejected/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-business",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "PAYMENT_STATUS_UPDATED_REJECTED_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/batch-to-approve/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/batch-to-approve/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..b6c2591
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/batch-to-approve/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Batch to approve",
+  "body": "Hi {{{user.preferredName}}}, you have a new batch of {{event.approval.amountDetails.currencyCode}} {{formatAmount event.approval.amountDetails.amount locale}} to approve."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/batch-to-approve/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/batch-to-approve/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..899fa5b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/batch-to-approve/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "PaymentBatch"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..9ac9d8d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Contact to approve",
+  "body": "Hi {{{user.preferredName}}}, you have a new contact to approve."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..e592b3b
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "Contact"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/push/en_US/engagement-template.json
new file mode 100644
index 0000000..9ac9d8d
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Contact to approve",
+  "body": "Hi {{{user.preferredName}}}, you have a new contact to approve."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/push/push_channel-settings.json
new file mode 100644
index 0000000..a81e3ba
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/contact-to-approve/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-business",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "CONTACT_TO_APPROVE_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/event-general-notifications.json
new file mode 100644
index 0000000..c5a0682
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/event-general-notifications.json
@@ -0,0 +1,120 @@
+{
+  "eventClassName": "com.backbase.dbs.approval.persistence.event.spec.v3.PendingApprovalEvent",
+  "id": "pending-approval",
+  "eventBusinessName": "Pending Approval",
+  "recipientType": "internal",
+  "extractor": "#this['approverIds']",
+  "serviceAgreementExtractor": "#this['approval']['serviceAgreementId']",
+  "generalNotifications": [
+    {
+      "id": "payment-to-approve",
+      "name": "Payment To Approve",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['approval']['resource'] == 'Payments'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/payment-to-approve/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "payment-approve-view",
+            "data": "{\"id\":\"{{event.approval.itemId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/payment-to-approve/in-app-notification/en_US/engagement-template.json",
+              "templateName": "payment-to-approve-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/payment-to-approve/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "payment-approve-view",
+            "data": "{\"id\":\"{{event.approval.itemId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/payment-to-approve/push/en_US/engagement-template.json",
+              "templateName": "payment-to-approve-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "contact-to-approve",
+      "name": "Contact To Approve",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['approval']['resource'] == 'Contacts'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/contact-to-approve/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "party-approve-view",
+            "data": "{\"id\":\"{{event.approval.itemId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/contact-to-approve/in-app-notification/en_US/engagement-template.json",
+              "templateName": "contact-to-approve-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/contact-to-approve/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "party-approve-view",
+            "data": "{\"id\":\"{{event.approval.itemId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/contact-to-approve/push/en_US/engagement-template.json",
+              "templateName": "contact-to-approve-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "batch-to-approve",
+      "name": "Batch To Approve",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "additionalFilterLogic": "#triggeredEvent['approval']['resource'] == 'Batch'",
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/batch-to-approve/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "batch-approve-view",
+            "data": "{\"id\":\"{{event.approval.itemId}}\", \"businessFunction\":\"{{event.approval.function}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/batch-to-approve/in-app-notification/en_US/engagement-template.json",
+              "templateName": "batch-to-approve-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..23dba55
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Payment to approve",
+  "body": "Hi {{{user.preferredName}}}, you have a new payment of {{event.approval.amountDetails.currencyCode}} {{formatAmount event.approval.amountDetails.amount locale}} to approve."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..860b2e9
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level": "INFO",
+  "targetGroup": "USER",
+  "origin": "Payment"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/push/en_US/engagement-template.json
new file mode 100644
index 0000000..23dba55
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "Payment to approve",
+  "body": "Hi {{{user.preferredName}}}, you have a new payment of {{event.approval.amountDetails.currencyCode}} {{formatAmount event.approval.amountDetails.amount locale}} to approve."
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/push/push_channel-settings.json
new file mode 100644
index 0000000..058af43
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/pending-approval/payment-to-approve/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-business",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "PAYMENT_TO_APPROVE_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "INFO"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/event-general-notifications.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/event-general-notifications.json
new file mode 100644
index 0000000..3779a82
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/event-general-notifications.json
@@ -0,0 +1,93 @@
+{
+  "eventClassName": "com.backbase.transaction.persistence.event.spec.v1.TransactionsAddedEvent",
+  "id": "transaction-added",
+  "eventBusinessName": "Transaction Added",
+  "recipientType": "subscription",
+  "extractor": "#this['arrangementId']",
+  "subscriptionType": "arrangement",
+  "eventSlicer": "#this['transactions']",
+  "generalNotifications": [
+    {
+      "id": "new-transaction-occurred",
+      "name": "New Transaction Occurred Retail",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/new-transaction-occurred-retail/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "transaction-view",
+            "data": "{\"id\":\"{{event.id}}\",\"arrangementId\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-transaction-occurred-retail/in-app-notification/en_US/engagement-template.json",
+              "templateName": "new-transaction-occurred-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/new-transaction-occurred-retail/push/push_channel-settings.json",
+          "isEnabledByDefault": true,
+          "routeInfo": {
+            "whereTo": "transaction-view",
+            "data": "{\"id\":\"{{event.id}}\",\"arrangementId\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-transaction-occurred-retail/push/en_US/engagement-template.json",
+              "templateName": "new-transaction-occurred-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "id": "new-transaction-occurred-business",
+      "name": "New Transaction Occurred Business",
+      "userPreferenceEnabled": true,
+      "manageable": false,
+      "deliveryOptions": [
+        {
+          "channel": "in-app-notification",
+          "channelSettings": "/new-transaction-occurred-business/in-app-notification/in-app_channel-settings.json",
+          "isEnabledByDefault": true,
+          "isManageableByUser": false,
+          "routeInfo": {
+            "whereTo": "transaction-view",
+            "data": "{\"id\":\"{{event.id}}\",\"arrangementId\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-transaction-occurred-business/in-app-notification/en_US/engagement-template.json",
+              "templateName": "new-transaction-occurred-in-app-notification",
+              "locale": "en_US"
+            }
+          ]
+        },
+        {
+          "channel": "push",
+          "channelSettings": "/new-transaction-occurred-business/push/push_channel-settings.json",
+          "isEnabledByDefault": false,
+          "routeInfo": {
+            "whereTo": "transaction-view",
+            "data": "{\"id\":\"{{event.id}}\",\"arrangementId\":\"{{event.arrangementId}}\"}"
+          },
+          "engagementTemplates": [
+            {
+              "path": "/new-transaction-occurred-business/push/en_US/engagement-template.json",
+              "templateName": "new-transaction-occurred-push",
+              "locale": "en_US"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..e990edb
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New transaction (business)",
+  "body": "&#128184; {{#eq event.creditDebitIndicator 'CRDT' }}Received{{else}}Paid{{/eq}} {{event.transactionAmountCurrency.currencyCode}} {{formatAmount event.transactionAmountCurrency.amount locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..016a7eb
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level":"INFO",
+  "targetGroup":"USER",
+  "origin":"Transaction"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/push/en_US/engagement-template.json
new file mode 100644
index 0000000..4ab1bf0
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New transaction (business)",
+  "body": "\uD83D\uDCB8 {{#eq event.creditDebitIndicator 'CRDT' }}Received{{else}}Paid{{/eq}} {{event.transactionAmountCurrency.currencyCode}} {{formatAmount event.transactionAmountCurrency.amount locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/push/push_channel-settings.json
new file mode 100644
index 0000000..f327bc4
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-business/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-business",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "NEW_TRANSACTION_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "ALERT"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/in-app-notification/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/in-app-notification/en_US/engagement-template.json
new file mode 100644
index 0000000..2a39438
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/in-app-notification/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New transaction (retail)",
+  "body": "&#128184; {{#eq event.creditDebitIndicator 'CRDT' }}Received{{else}}Paid{{/eq}} {{event.transactionAmountCurrency.currencyCode}} {{formatAmount event.transactionAmountCurrency.amount locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/in-app-notification/in-app_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/in-app-notification/in-app_channel-settings.json
new file mode 100644
index 0000000..016a7eb
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/in-app-notification/in-app_channel-settings.json
@@ -0,0 +1,5 @@
+{
+  "level":"INFO",
+  "targetGroup":"USER",
+  "origin":"Transaction"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/push/en_US/engagement-template.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/push/en_US/engagement-template.json
new file mode 100644
index 0000000..3b189e5
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/push/en_US/engagement-template.json
@@ -0,0 +1,4 @@
+{
+  "title": "New transaction (retail)",
+  "body": "\uD83D\uDCB8 {{#eq event.creditDebitIndicator 'CRDT' }}Received{{else}}Paid{{/eq}} {{event.transactionAmountCurrency.currencyCode}} {{formatAmount event.transactionAmountCurrency.amount locale}}"
+}
\ No newline at end of file
diff --git a/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/push/push_channel-settings.json b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/push/push_channel-settings.json
new file mode 100644
index 0000000..5231b39
--- /dev/null
+++ b/collections/oneruntime/general-notifications/event-general-notifications/transaction-added/new-transaction-occurred-retail/push/push_channel-settings.json
@@ -0,0 +1,22 @@
+{
+  "appName": "model-bank-retail",
+  "payload": {
+    "android": {
+      "settings": {
+        "sound": "default",
+        "color": "#FFE5CC",
+        "icon": "hello"
+      }
+    },
+    "ios": {
+      "settings": {
+        "category": "NEW_TRANSACTION_CATEGORY",
+        "sound": "bingbong.aiff",
+        "interruption-level": "active"
+      }
+    },
+    "data": {
+      "level": "ALERT"
+    }
+  }
+}
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-message/format.txt b/collections/oneruntime/repositories/repositories-azure/engagement-message/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-message/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-message/package.xml b/collections/oneruntime/repositories/repositories-azure/engagement-message/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-message/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-message/repository.xml b/collections/oneruntime/repositories/repositories-azure/engagement-message/repository.xml
new file mode 100644
index 0000000..bc8c08f
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-message/repository.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+	xmlns:ns2="http://www.backbase.com/content/model/1.0">
+	<ns2:repository>
+		<ns2:repositoryId>engagement-message</ns2:repositoryId>
+		<ns2:name>Engagement Message Repository</ns2:name>
+		<ns2:description>Repository to store engagement messages</ns2:description>
+		<ns2:isPrivate>true</ns2:isPrivate>
+		<ns2:implementation>azureblob</ns2:implementation>
+		<ns2:c3RepositoryId>engagement-message</ns2:c3RepositoryId>
+		<ns2:versioningEnabled>false</ns2:versioningEnabled>
+	</ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/format.txt b/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/package.xml b/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/repository.xml b/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/repository.xml
new file mode 100644
index 0000000..aea9f18
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-template-custom/repository.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>engagement-template-custom</ns2:repositoryId>
+    <ns2:name>Engagement Template Custom Repository</ns2:name>
+    <ns2:description>Repository to store engagement templates for engagements where engagement is custom</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>azureblob</ns2:implementation>
+    <ns2:c3RepositoryId>engagement-template-custom</ns2:c3RepositoryId>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/format.txt b/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/package.xml b/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/repository.xml b/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/repository.xml
new file mode 100644
index 0000000..c75418e
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/engagement-template-general-notification/repository.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>engagement-template-notification</ns2:repositoryId>
+    <ns2:name>Engagement Template General Notification Repository</ns2:name>
+    <ns2:description>Repository to store engagement templates for engagements where engagement is general notification</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>azureblob</ns2:implementation>
+    <ns2:c3RepositoryId>engagement-template-notification</ns2:c3RepositoryId>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/template-custom/format.txt b/collections/oneruntime/repositories/repositories-azure/template-custom/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/template-custom/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/template-custom/package.xml b/collections/oneruntime/repositories/repositories-azure/template-custom/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/template-custom/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-azure/template-custom/repository.xml b/collections/oneruntime/repositories/repositories-azure/template-custom/repository.xml
new file mode 100644
index 0000000..9b0a667
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-azure/template-custom/repository.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>template-custom</ns2:repositoryId>
+    <ns2:name>Template Custom Repository</ns2:name>
+    <ns2:description>Repository to store templates for engagements where engagement is custom</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>azureblob</ns2:implementation>
+    <ns2:c3RepositoryId>template-custom</ns2:c3RepositoryId>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-message/format.txt b/collections/oneruntime/repositories/repositories-db/engagement-message/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-message/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-message/package.xml b/collections/oneruntime/repositories/repositories-db/engagement-message/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-message/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-message/repository.xml b/collections/oneruntime/repositories/repositories-db/engagement-message/repository.xml
new file mode 100644
index 0000000..3d61c63
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-message/repository.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+	xmlns:ns2="http://www.backbase.com/content/model/1.0">
+	<ns2:repository>
+		<ns2:repositoryId>engagement-message</ns2:repositoryId>
+		<ns2:name>Engagement Message Repository</ns2:name>
+		<ns2:description>Repository to store engagement messages</ns2:description>
+		<ns2:isPrivate>true</ns2:isPrivate>
+		<ns2:implementation>DB</ns2:implementation>
+		<ns2:versioningEnabled>false</ns2:versioningEnabled>
+	</ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-template-custom/format.txt b/collections/oneruntime/repositories/repositories-db/engagement-template-custom/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-template-custom/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-template-custom/package.xml b/collections/oneruntime/repositories/repositories-db/engagement-template-custom/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-template-custom/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-template-custom/repository.xml b/collections/oneruntime/repositories/repositories-db/engagement-template-custom/repository.xml
new file mode 100644
index 0000000..d0b8f5b
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-template-custom/repository.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>engagement-template-custom</ns2:repositoryId>
+    <ns2:name>Engagement Template Custom Repository</ns2:name>
+    <ns2:description>Repository to store engagement templates for engagements where engagement is custom</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>DB</ns2:implementation>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/format.txt b/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/package.xml b/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/repository.xml b/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/repository.xml
new file mode 100644
index 0000000..d2b62c9
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/engagement-template-general-notification/repository.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>engagement-template-notification</ns2:repositoryId>
+    <ns2:name>Engagement Template General Notification Repository</ns2:name>
+    <ns2:description>Repository to store engagement templates for engagements where engagement is general notification</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>DB</ns2:implementation>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/template-custom/format.txt b/collections/oneruntime/repositories/repositories-db/template-custom/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/template-custom/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/template-custom/package.xml b/collections/oneruntime/repositories/repositories-db/template-custom/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/template-custom/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-db/template-custom/repository.xml b/collections/oneruntime/repositories/repositories-db/template-custom/repository.xml
new file mode 100644
index 0000000..8ad5af5
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-db/template-custom/repository.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>template-custom</ns2:repositoryId>
+    <ns2:name>Template Custom Repository</ns2:name>
+    <ns2:description>Repository to store templates for engagements where engagement is custom</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>DB</ns2:implementation>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-message/format.txt b/collections/oneruntime/repositories/repositories-s3/engagement-message/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-message/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-message/package.xml b/collections/oneruntime/repositories/repositories-s3/engagement-message/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-message/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-message/repository.xml b/collections/oneruntime/repositories/repositories-s3/engagement-message/repository.xml
new file mode 100644
index 0000000..29ca4c0
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-message/repository.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+	xmlns:ns2="http://www.backbase.com/content/model/1.0">
+	<ns2:repository>
+		<ns2:repositoryId>engagement-message</ns2:repositoryId>
+		<ns2:name>Engagement Message Repository</ns2:name>
+		<ns2:description>Repository to store engagement messages</ns2:description>
+		<ns2:isPrivate>true</ns2:isPrivate>
+		<ns2:implementation>s3</ns2:implementation>
+		<ns2:c3RepositoryId>engagement-message</ns2:c3RepositoryId>
+		<ns2:versioningEnabled>false</ns2:versioningEnabled>
+	</ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/format.txt b/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/package.xml b/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/repository.xml b/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/repository.xml
new file mode 100644
index 0000000..c1f6e96
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-template-custom/repository.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>engagement-template-custom</ns2:repositoryId>
+    <ns2:name>Engagement Template Custom Repository</ns2:name>
+    <ns2:description>Repository to store engagement templates for engagements where engagement is custom</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>s3</ns2:implementation>
+    <ns2:c3RepositoryId>engagement-template-custom</ns2:c3RepositoryId>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/format.txt b/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/package.xml b/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/repository.xml b/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/repository.xml
new file mode 100644
index 0000000..f3588ff
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/engagement-template-general-notification/repository.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>engagement-template-notification</ns2:repositoryId>
+    <ns2:name>Engagement Template General Notification Repository</ns2:name>
+    <ns2:description>Repository to store engagement templates for engagements where engagement is general notification</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>s3</ns2:implementation>
+    <ns2:c3RepositoryId>engagement-template-notification</ns2:c3RepositoryId>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/template-custom/format.txt b/collections/oneruntime/repositories/repositories-s3/template-custom/format.txt
new file mode 100644
index 0000000..5049538
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/template-custom/format.txt
@@ -0,0 +1 @@
+6.0
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/template-custom/package.xml b/collections/oneruntime/repositories/repositories-s3/template-custom/package.xml
new file mode 100644
index 0000000..035b318
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/template-custom/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><contentItems xmlns:ns2="http://www.backbase.com/content/model/1.0"/>
\ No newline at end of file
diff --git a/collections/oneruntime/repositories/repositories-s3/template-custom/repository.xml b/collections/oneruntime/repositories/repositories-s3/template-custom/repository.xml
new file mode 100644
index 0000000..9571403
--- /dev/null
+++ b/collections/oneruntime/repositories/repositories-s3/template-custom/repository.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<ns2:repositories
+  xmlns:ns2="http://www.backbase.com/content/model/1.0">
+  <ns2:repository>
+    <ns2:repositoryId>template-custom</ns2:repositoryId>
+    <ns2:name>Template Custom Repository</ns2:name>
+    <ns2:description>Repository to store templates for engagements where engagement is custom</ns2:description>
+    <ns2:isPrivate>false</ns2:isPrivate>
+    <ns2:implementation>s3</ns2:implementation>
+    <ns2:c3RepositoryId>template-custom</ns2:c3RepositoryId>
+    <ns2:versioningEnabled>false</ns2:versioningEnabled>
+    <ns2:isProtected>true</ns2:isProtected>
+  </ns2:repository>
+</ns2:repositories>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f33bcdb..c522b01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,17 @@
                             <arguments>business</arguments>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>create-collections-oneruntime</id>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <phase>compile</phase>
+                        <configuration>
+                            <executable>${project.basedir}/ci/scripts/create-collections.sh</executable>
+                            <arguments>oneruntime</arguments>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -163,6 +174,25 @@
                                     </images>
                                 </configuration>
                             </execution>
+                            <execution>
+                                <id>docker-build-oneruntime</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                                <configuration>
+                                    <images>
+                                        <image>
+                                            <name>${docker.repo.url}/${project.artifactId}-oneruntime:${backbase-bom.version}-${project.version}</name>
+                                            <build>
+                                                <args>
+                                                    <PRODUCT_LINE>oneruntime</PRODUCT_LINE>
+                                                </args>
+                                            </build>
+                                        </image>
+                                    </images>
+                                </configuration>
+                            </execution>
                         </executions>
                     </plugin>
                 </plugins>
@@ -249,6 +279,46 @@
             </build>
         </profile>
 
+        <profile>
+            <id>build-oneruntime</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <docker.skip>false</docker.skip>
+                <docker.skipPush>true</docker.skipPush>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-build-oneruntime</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>${docker.repo.url}/${project.artifactId}-oneruntime:${backbase-bom.version}-${project.version}</name>
+                                    <build>
+                                        <args>
+                                            <PRODUCT_LINE>oneruntime</PRODUCT_LINE>
+                                        </args>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>push-retail</id>
             <activation>
@@ -332,6 +402,48 @@
                 </plugins>
             </build>
         </profile>
+
+        <profile>
+            <id>push-oneruntime</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <properties>
+                <docker.skipPush>false</docker.skipPush>
+                <docker.push.registry>${docker.repo.url}</docker.push.registry>
+                <docker.registry>${docker.repo.url}</docker.registry>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>docker-push-oneruntime</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <registry>${docker.repo.url}</registry>
+                            <images>
+                                <image>
+                                    <name>${docker.repo.url}/${project.artifactId}-oneruntime:${backbase-bom.version}-${project.version}</name>
+                                    <build>
+                                        <args>
+                                            <PRODUCT_LINE>oneruntime</PRODUCT_LINE>
+                                        </args>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
 </project>