diff --git a/ui/app/app.js b/ui/app/app.js
index ca321646f4b0..da3e07a3ec75 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -15,12 +15,12 @@ export default class App extends Application {
   engines = {
     openApiExplorer: {
       dependencies: {
-        services: ['auth', 'namespace', 'router', 'version'],
+        services: ['auth', 'flash-messages', 'namespace', 'router', 'version'],
       },
     },
     replication: {
       dependencies: {
-        services: ['auth', 'namespace', 'replication-mode', 'router', 'store', 'version'],
+        services: ['auth', 'flash-messages', 'namespace', 'replication-mode', 'router', 'store', 'version'],
         externalRoutes: {
           replication: 'vault.cluster.replication.index',
         },
@@ -31,6 +31,7 @@ export default class App extends Application {
         services: [
           'auth',
           'download',
+          'flash-messages',
           'namespace',
           'path-help',
           'router',
@@ -45,7 +46,7 @@ export default class App extends Application {
     },
     kubernetes: {
       dependencies: {
-        services: ['router', 'store', 'secret-mount-path'],
+        services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
         externalRoutes: {
           secrets: 'vault.cluster.secrets.backends',
         },
@@ -56,6 +57,7 @@ export default class App extends Application {
         services: [
           'auth',
           'download',
+          'flash-messages',
           'namespace',
           'path-help',
           'router',
diff --git a/ui/app/services/flash-messages.ts b/ui/app/services/flash-messages.ts
new file mode 100644
index 000000000000..708fad47e48c
--- /dev/null
+++ b/ui/app/services/flash-messages.ts
@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import FlashMessages from 'ember-cli-flash/services/flash-messages';
+
+/*
+we extend the ember-cli-flash service here so each ember engine can
+import 'flash-messages' as a dependency giving it access to the 
+<FlashMessage> template in the main app's cluster.hbs file
+*/
+export default class FlashMessageService extends FlashMessages {}
diff --git a/ui/lib/kmip/package.json b/ui/lib/kmip/package.json
index 21a5a131d5eb..d3732ae651e7 100644
--- a/ui/lib/kmip/package.json
+++ b/ui/lib/kmip/package.json
@@ -6,7 +6,6 @@
   ],
   "dependencies": {
     "ember-cli-htmlbars": "*",
-    "ember-cli-flash": "*",
     "ember-cli-babel": "*"
   },
   "ember-addon": {
diff --git a/ui/lib/kubernetes/addon/engine.js b/ui/lib/kubernetes/addon/engine.js
index 686f412ff750..5830ad465283 100644
--- a/ui/lib/kubernetes/addon/engine.js
+++ b/ui/lib/kubernetes/addon/engine.js
@@ -16,7 +16,7 @@ export default class KubernetesEngine extends Engine {
   modulePrefix = modulePrefix;
   Resolver = Resolver;
   dependencies = {
-    services: ['router', 'store', 'secret-mount-path', 'flashMessages'],
+    services: ['router', 'store', 'secret-mount-path', 'flash-messages'],
     externalRoutes: ['secrets'],
   };
 }
diff --git a/ui/lib/kubernetes/package.json b/ui/lib/kubernetes/package.json
index d5c7895ba5a2..068934f6f16b 100644
--- a/ui/lib/kubernetes/package.json
+++ b/ui/lib/kubernetes/package.json
@@ -7,7 +7,6 @@
   "dependencies": {
     "ember-cli-htmlbars": "*",
     "ember-cli-babel": "*",
-    "ember-cli-flash": "*",
     "ember-concurrency": "*",
     "@ember/test-waiters": "*",
     "ember-inflector": "*"
diff --git a/ui/lib/open-api-explorer/package.json b/ui/lib/open-api-explorer/package.json
index 2e727637a2a1..f08b841fe38f 100644
--- a/ui/lib/open-api-explorer/package.json
+++ b/ui/lib/open-api-explorer/package.json
@@ -7,7 +7,6 @@
   "dependencies": {
     "ember-cli-htmlbars": "*",
     "ember-cli-babel": "*",
-    "ember-cli-flash": "*",
     "ember-auto-import": "*",
     "swagger-ui-dist": "*"
   },
diff --git a/ui/lib/pki/addon/components/page/pki-certificate-details.ts b/ui/lib/pki/addon/components/page/pki-certificate-details.ts
index 3ea0f3979268..4dcbfc3a9e5d 100644
--- a/ui/lib/pki/addon/components/page/pki-certificate-details.ts
+++ b/ui/lib/pki/addon/components/page/pki-certificate-details.ts
@@ -9,7 +9,7 @@ import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import errorMessage from 'vault/utils/error-message';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import DownloadService from 'vault/services/download';
 import PkiCertificateBaseModel from 'vault/models/pki/certificate/base';
 
diff --git a/ui/lib/pki/addon/components/page/pki-configure-create.ts b/ui/lib/pki/addon/components/page/pki-configure-create.ts
index d130e824ee53..94c859a81fc6 100644
--- a/ui/lib/pki/addon/components/page/pki-configure-create.ts
+++ b/ui/lib/pki/addon/components/page/pki-configure-create.ts
@@ -9,7 +9,7 @@ import { tracked } from '@glimmer/tracking';
 // TYPES
 import Store from '@ember-data/store';
 import Router from '@ember/routing/router';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import PkiActionModel from 'vault/models/pki/action';
 import { Breadcrumb } from 'vault/vault/app-types';
 
diff --git a/ui/lib/pki/addon/components/page/pki-issuer-edit.ts b/ui/lib/pki/addon/components/page/pki-issuer-edit.ts
index c75bb8b03706..6cef16de4e01 100644
--- a/ui/lib/pki/addon/components/page/pki-issuer-edit.ts
+++ b/ui/lib/pki/addon/components/page/pki-issuer-edit.ts
@@ -11,7 +11,7 @@ import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import errorMessage from 'vault/utils/error-message';
 import RouterService from '@ember/routing/router-service';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import PkiIssuerModel from 'vault/models/pki/issuer';
 
 interface Args {
diff --git a/ui/lib/pki/addon/components/page/pki-key-details.ts b/ui/lib/pki/addon/components/page/pki-key-details.ts
index b14045d14649..c164b6cb4d98 100644
--- a/ui/lib/pki/addon/components/page/pki-key-details.ts
+++ b/ui/lib/pki/addon/components/page/pki-key-details.ts
@@ -6,7 +6,7 @@
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
 import RouterService from '@ember/routing/router-service';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import { inject as service } from '@ember/service';
 import errorMessage from 'vault/utils/error-message';
 import PkiKeyModel from 'vault/models/pki/key';
diff --git a/ui/lib/pki/addon/components/page/pki-role-details.ts b/ui/lib/pki/addon/components/page/pki-role-details.ts
index 3d9348c9d984..2e9a27f9a1eb 100644
--- a/ui/lib/pki/addon/components/page/pki-role-details.ts
+++ b/ui/lib/pki/addon/components/page/pki-role-details.ts
@@ -6,7 +6,7 @@
 import { action } from '@ember/object';
 import RouterService from '@ember/routing/router-service';
 import Component from '@glimmer/component';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import SecretMountPath from 'vault/services/secret-mount-path';
 import { inject as service } from '@ember/service';
 import errorMessage from 'vault/utils/error-message';
diff --git a/ui/lib/pki/addon/components/pki-generate-csr.ts b/ui/lib/pki/addon/components/pki-generate-csr.ts
index e288f45a5d4c..e85f6a2fa76f 100644
--- a/ui/lib/pki/addon/components/pki-generate-csr.ts
+++ b/ui/lib/pki/addon/components/pki-generate-csr.ts
@@ -10,7 +10,7 @@ import { action } from '@ember/object';
 import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
 import { expandAttributeMeta } from 'vault/utils/field-to-attrs';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import PkiActionModel from 'vault/models/pki/action';
 import errorMessage from 'vault/utils/error-message';
 
diff --git a/ui/lib/pki/addon/components/pki-generate-root.ts b/ui/lib/pki/addon/components/pki-generate-root.ts
index df43adf319f5..6a4177dce99f 100644
--- a/ui/lib/pki/addon/components/pki-generate-root.ts
+++ b/ui/lib/pki/addon/components/pki-generate-root.ts
@@ -12,7 +12,7 @@ import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
 import PkiActionModel from 'vault/models/pki/action';
 import PkiUrlsModel from 'vault/models/pki/urls';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import errorMessage from 'vault/utils/error-message';
 import { parsedParameters } from 'vault/utils/parse-pki-cert-oids';
 
diff --git a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts b/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
index a8ebf4215199..3549ce314981 100644
--- a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
+++ b/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
@@ -5,7 +5,7 @@
 
 import { action } from '@ember/object';
 import Component from '@glimmer/component';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/lib/pki/addon/components/pki-role-generate.ts b/ui/lib/pki/addon/components/pki-role-generate.ts
index 6a6ac855a88a..a4ee5df51358 100644
--- a/ui/lib/pki/addon/components/pki-role-generate.ts
+++ b/ui/lib/pki/addon/components/pki-role-generate.ts
@@ -11,7 +11,7 @@ import Router from '@ember/routing/router';
 import Store from '@ember-data/store';
 import { tracked } from '@glimmer/tracking';
 import errorMessage from 'vault/utils/error-message';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import DownloadService from 'vault/services/download';
 import PkiCertificateGenerateModel from 'vault/models/pki/certificate/generate';
 import PkiCertificateSignModel from 'vault/models/pki/certificate/sign';
diff --git a/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts b/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts
index 1feb298df522..83ecae25d13f 100644
--- a/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts
+++ b/ui/lib/pki/addon/components/pki-sign-intermediate-form.ts
@@ -10,7 +10,7 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { task } from 'ember-concurrency';
 import PkiCertificateSignIntermediate from 'vault/models/pki/certificate/sign-intermediate';
-import FlashMessageService from 'ember-cli-flash/services/flash-messages';
+import FlashMessageService from 'vault/services/flash-messages';
 import errorMessage from 'vault/utils/error-message';
 
 interface Args {
diff --git a/ui/lib/pki/package.json b/ui/lib/pki/package.json
index a619c65db765..5f86b47157b4 100644
--- a/ui/lib/pki/package.json
+++ b/ui/lib/pki/package.json
@@ -7,7 +7,6 @@
   "dependencies": {
     "ember-cli-babel": "*",
     "ember-cli-htmlbars": "*",
-    "ember-cli-flash": "*",
     "ember-cli-typescript": "*",
     "@types/ember": "latest",
     "@types/ember-data": "latest",
diff --git a/ui/lib/replication/package.json b/ui/lib/replication/package.json
index a6e00ce9f409..108f8834884a 100644
--- a/ui/lib/replication/package.json
+++ b/ui/lib/replication/package.json
@@ -6,7 +6,6 @@
   ],
   "dependencies": {
     "ember-cli-htmlbars": "*",
-    "ember-cli-flash": "*",
     "ember-cli-babel": "*"
   },
   "ember-addon": {