diff --git a/addons/api/README.md b/addons/api/README.md
index 3e942bc54a..91d6835fad 100644
--- a/addons/api/README.md
+++ b/addons/api/README.md
@@ -23,15 +23,45 @@ This addon contains the API data access layer for Boundary.
 Add this addon to an Ember application's `devDependencies` as:
 `"api": "workspace:*"`, for applications included in this monorepo.
 
-Since this addon also includes Mirage mocks, be sure to install
-`ember-cli-mirage` and add the following config to your UI project:
+This addon also includes Mirage mocks. To include the `miragejs` dependency and this addon's mirage handlers configure the consuming app's `config/environment.js`
 
 ```js
-'ember-cli-mirage': {
-  directory: '../../addons/api/mirage'
+mirage: {
+  enabled: true
 }
 ```
 
+To have mirage start and intercept requests when the application starts:
+1. Add the `@embroider/macros` dependency to your application
+2. Configure `@embroider/macros` with `startMirageWithApp` based on app's config within `ember-cli-build.js`:
+
+```js
+// ember-cli-build.js
+module.exports = async function (defaults) {
+  // load the app's config 
+  const { EMBER_ENV } = process.env;
+  var config = require('./config/environment')(EMBER_ENV);
+
+  const app = new EmberApp(defaults, {
+    '@embroider/macros': {
+      setOwnConfig: {
+        startMirageWithApp: config.mirage?.enabled ?? false
+      },
+    },
+  });
+}
+```
+
+3. Finally, use the `@embroider/macros` config value for `startMirageWithApp` in `app/app.js` to conditionally start mirage:
+
+```js
+import { macroCondition, importSync, getOwnConfig, isTesting } from '@embroider/macros';
+
+if (macroCondition(getOwnConfig().startMirageWithApp && !isTesting())) {
+  const startServer = importSync('api/mirage/config').default;
+  startServer({});
+}
+```
 ## Installation
 
 See monorepo README for installation instructions.
diff --git a/addons/api/addon-test-support/helpers/mirage.js b/addons/api/addon-test-support/helpers/mirage.js
new file mode 100644
index 0000000000..96c2ad8c4f
--- /dev/null
+++ b/addons/api/addon-test-support/helpers/mirage.js
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: BUSL-1.1
+ */
+
+import { settled } from '@ember/test-helpers';
+import startMirage from 'api/mirage/config';
+
+export function setupMirage(hooks) {
+  hooks.beforeEach(function () {
+    if (!this.owner) {
+      throw new Error(
+        'Must call one of the ember-qunit setupTest() / setupRenderingTest() / setupApplicationTest() first',
+      );
+    }
+
+    // the environment property here is configuration to the mirage server:
+    // https://github.com/miragejs/miragejs/blob/7ff4f3f6fe56bf0cb1648f5af3f5210fcb07e20b/types/index.d.ts#L383
+    // It is not related to ember's build environment. In this case for mirage the "test" environment does
+    // not load the default scenario:
+    // https://github.com/miragejs/miragejs/blob/7ff4f3f6fe56bf0cb1648f5af3f5210fcb07e20b/lib/server.js#L302
+    this.server = startMirage({ environment: 'test' });
+  });
+
+  hooks.afterEach(function () {
+    return settled().then(() => {
+      if (this.server) {
+        this.server.shutdown();
+        delete this.server;
+      }
+    });
+  });
+}
diff --git a/addons/api/mirage/config.js b/addons/api/addon/mirage/config.js
similarity index 78%
rename from addons/api/mirage/config.js
rename to addons/api/addon/mirage/config.js
index f608d69423..e9fea778ad 100644
--- a/addons/api/mirage/config.js
+++ b/addons/api/addon/mirage/config.js
@@ -3,12 +3,7 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
-import {
-  discoverEmberDataModels,
-  applyEmberDataSerializers,
-} from 'ember-cli-mirage';
 import { createServer, Response } from 'miragejs';
-import environmentConfig from '../config/environment';
 import { authHandler, deauthHandler } from './route-handlers/auth';
 import { targetHandler } from './route-handlers/target';
 import { pickRandomStatusString } from './factories/session';
@@ -17,19 +12,177 @@ import makeBooleanFilter from './helpers/bexpr-filter';
 import { faker } from '@faker-js/faker';
 import { asciicasts } from './data/asciicasts';
 import { TYPE_WORKER_PKI } from 'api/models/worker';
+import environmentConfig from 'ember-get-config';
+
+// mirage models (alphabetical)
+import accountModel from './models/account';
+import aliasModel from './models/alias';
+import authMethodModel from './models/auth-method';
+import baseModel from './models/base';
+import channelRecordingModel from './models/channel-recording';
+import connectionRecordingModel from './models/connection-recording';
+import credentialLibraryModel from './models/credential-library';
+import credentialStoreModel from './models/credential-store';
+import credentialModel from './models/credential';
+import groupModel from './models/group';
+import hostCatalogModel from './models/host-catalog';
+import hostSetModel from './models/host-set';
+import hostModel from './models/host';
+import managedGroupModel from './models/managed-group';
+import policyModel from './models/policy';
+import roleModel from './models/role';
+import scopeModel from './models/scope';
+import sessionRecordingModel from './models/session-recording';
+import sessionModel from './models/session';
+import storageBucketModel from './models/storage-bucket';
+import targetModel from './models/target';
+import userModel from './models/user';
+import workerModel from './models/worker';
+
+// mirage serializers (alphabetical)
+import accountSerializer from './serializers/account';
+import aliasSerializer from './serializers/alias';
+import applicationSerializer from './serializers/application';
+import authMethodSerializer from './serializers/auth-method';
+import channelRecordingSerializer from './serializers/channel-recording';
+import connectionRecordingSerializer from './serializers/connection-recording';
+import credentialLibrarySerializer from './serializers/credential-library';
+import credentialStoreSerializer from './serializers/credential-store';
+import credentialSerializer from './serializers/credential';
+import groupSerializer from './serializers/group';
+import hostCatalogSerializer from './serializers/host-catalog';
+import hostSetSerializer from './serializers/host-set';
+import hostSerializer from './serializers/host';
+import managedGroupSerializer from './serializers/managed-group';
+import policySerializer from './serializers/policy';
+import roleSerializer from './serializers/role';
+import scopeSerializer from './serializers/scope';
+import sessionRecordingSerializer from './serializers/session-recording';
+import sessionSerializer from './serializers/session';
+import storageBucketSerializer from './serializers/storage-bucket';
+import targetSerializer from './serializers/target';
+import userSerializer from './serializers/user';
+import workerSerializer from './serializers/worker';
+
+// mirage scenarios (alphabetical)
+import defaultScenario from './scenarios/default';
+import ipcScenario from './scenarios/ipc';
+
+// mirage factories (alphabetical)
+import accountFactory from './factories/account';
+import aliasFactory from './factories/alias';
+import authMethodFactory from './factories/auth-method';
+import channelRecordingFactory from './factories/channel-recording';
+import connectionRecordingFactory from './factories/connection-recording';
+import credentialLibraryFactory from './factories/credential-library';
+import credentialStoreFactory from './factories/credential-store';
+import credentialFactory from './factories/credential';
+import groupFactory from './factories/group';
+import hostCatalogFactory from './factories/host-catalog';
+import hostSetFactory from './factories/host-set';
+import hostFactory from './factories/host';
+import managedGroupFactory from './factories/managed-group';
+import policyFactory from './factories/policy';
+import roleFactory from './factories/role';
+import scopeFactory from './factories/scope';
+import sessionRecordingFactory from './factories/session-recording';
+import storageBucketFactory from './factories/storage-bucket';
+import sessionFactory from './factories/session';
+import targetFactory from './factories/target';
+import userFactory from './factories/user';
+import workerFactory from './factories/worker';
 
 const isTesting = environmentConfig.environment === 'test';
 
 // Main function
-// More info about server configuration https://www.ember-cli-mirage.com/docs/advanced/server-configuration
+// More info about server configuration:
+// https://github.com/miragejs/miragejs/blob/7ff4f3f6fe56bf0cb1648f5af3f5210fcb07e20b/types/index.d.ts#L375-L404
 export default function (mirageConfig) {
   let finalConfig = {
     ...mirageConfig,
+
+    scenarios: {
+      default: defaultScenario,
+      ipcScenario: ipcScenario,
+    },
+
+    factories: {
+      account: accountFactory,
+      alias: aliasFactory,
+      authMethod: authMethodFactory,
+      channelRecording: channelRecordingFactory,
+      connectionRecording: connectionRecordingFactory,
+      credentialLibrary: credentialLibraryFactory,
+      credentialStore: credentialStoreFactory,
+      credential: credentialFactory,
+      group: groupFactory,
+      hostCatalog: hostCatalogFactory,
+      hostSet: hostSetFactory,
+      host: hostFactory,
+      managedGroup: managedGroupFactory,
+      policy: policyFactory,
+      role: roleFactory,
+      scope: scopeFactory,
+      sessionRecording: sessionRecordingFactory,
+      session: sessionFactory,
+      storageBucket: storageBucketFactory,
+      target: targetFactory,
+      user: userFactory,
+      worker: workerFactory,
+    },
+
     models: {
-      ...discoverEmberDataModels(mirageConfig.store),
-      ...mirageConfig.models,
+      account: accountModel,
+      alias: aliasModel,
+      authMethod: authMethodModel,
+      base: baseModel,
+      channelRecording: channelRecordingModel,
+      connectionRecording: connectionRecordingModel,
+      credentialLibrary: credentialLibraryModel,
+      credentialStore: credentialStoreModel,
+      credential: credentialModel,
+      group: groupModel,
+      hostCatalog: hostCatalogModel,
+      hostSet: hostSetModel,
+      host: hostModel,
+      managedGroup: managedGroupModel,
+      policy: policyModel,
+      role: roleModel,
+      scope: scopeModel,
+      sessionRecording: sessionRecordingModel,
+      session: sessionModel,
+      storageBucket: storageBucketModel,
+      target: targetModel,
+      user: userModel,
+      worker: workerModel,
+    },
+
+    serializers: {
+      account: accountSerializer,
+      alias: aliasSerializer,
+      application: applicationSerializer,
+      authMethod: authMethodSerializer,
+      channelRecording: channelRecordingSerializer,
+      connectionRecording: connectionRecordingSerializer,
+      credentialLibrary: credentialLibrarySerializer,
+      credentialStore: credentialStoreSerializer,
+      credential: credentialSerializer,
+      group: groupSerializer,
+      hostCatalog: hostCatalogSerializer,
+      hostSet: hostSetSerializer,
+      host: hostSerializer,
+      managedGroup: managedGroupSerializer,
+      policy: policySerializer,
+      role: roleSerializer,
+      scope: scopeSerializer,
+      sessionRecording: sessionRecordingSerializer,
+      session: sessionSerializer,
+      storageBucket: storageBucketSerializer,
+      target: targetSerializer,
+      user: userSerializer,
+      worker: workerSerializer,
     },
-    serializers: applyEmberDataSerializers(mirageConfig.serializers),
+
     routes,
   };
   return createServer(finalConfig);
@@ -58,7 +211,7 @@ function routes() {
   });
 
   // make this `/api`, for example, if your API is namespaced
-  this.namespace = environmentConfig.api.namespace;
+  this.namespace = environmentConfig.api?.namespace;
   // delay for each request, automatically set to 0 during testing
   this.timing = 1;
 
diff --git a/addons/api/mirage/data/asciicasts.js b/addons/api/addon/mirage/data/asciicasts.js
similarity index 100%
rename from addons/api/mirage/data/asciicasts.js
rename to addons/api/addon/mirage/data/asciicasts.js
diff --git a/addons/api/mirage/factories/account.js b/addons/api/addon/mirage/factories/account.js
similarity index 100%
rename from addons/api/mirage/factories/account.js
rename to addons/api/addon/mirage/factories/account.js
diff --git a/addons/api/mirage/factories/alias.js b/addons/api/addon/mirage/factories/alias.js
similarity index 100%
rename from addons/api/mirage/factories/alias.js
rename to addons/api/addon/mirage/factories/alias.js
diff --git a/addons/api/mirage/factories/auth-method.js b/addons/api/addon/mirage/factories/auth-method.js
similarity index 100%
rename from addons/api/mirage/factories/auth-method.js
rename to addons/api/addon/mirage/factories/auth-method.js
diff --git a/addons/api/mirage/factories/channel-recording.js b/addons/api/addon/mirage/factories/channel-recording.js
similarity index 100%
rename from addons/api/mirage/factories/channel-recording.js
rename to addons/api/addon/mirage/factories/channel-recording.js
diff --git a/addons/api/mirage/factories/connection-recording.js b/addons/api/addon/mirage/factories/connection-recording.js
similarity index 100%
rename from addons/api/mirage/factories/connection-recording.js
rename to addons/api/addon/mirage/factories/connection-recording.js
diff --git a/addons/api/mirage/factories/credential-library.js b/addons/api/addon/mirage/factories/credential-library.js
similarity index 100%
rename from addons/api/mirage/factories/credential-library.js
rename to addons/api/addon/mirage/factories/credential-library.js
diff --git a/addons/api/mirage/factories/credential-store.js b/addons/api/addon/mirage/factories/credential-store.js
similarity index 100%
rename from addons/api/mirage/factories/credential-store.js
rename to addons/api/addon/mirage/factories/credential-store.js
diff --git a/addons/api/mirage/factories/credential.js b/addons/api/addon/mirage/factories/credential.js
similarity index 100%
rename from addons/api/mirage/factories/credential.js
rename to addons/api/addon/mirage/factories/credential.js
diff --git a/addons/api/mirage/factories/group.js b/addons/api/addon/mirage/factories/group.js
similarity index 100%
rename from addons/api/mirage/factories/group.js
rename to addons/api/addon/mirage/factories/group.js
diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/addon/mirage/factories/host-catalog.js
similarity index 100%
rename from addons/api/mirage/factories/host-catalog.js
rename to addons/api/addon/mirage/factories/host-catalog.js
diff --git a/addons/api/mirage/factories/host-set.js b/addons/api/addon/mirage/factories/host-set.js
similarity index 100%
rename from addons/api/mirage/factories/host-set.js
rename to addons/api/addon/mirage/factories/host-set.js
diff --git a/addons/api/mirage/factories/host.js b/addons/api/addon/mirage/factories/host.js
similarity index 100%
rename from addons/api/mirage/factories/host.js
rename to addons/api/addon/mirage/factories/host.js
diff --git a/addons/api/mirage/factories/managed-group.js b/addons/api/addon/mirage/factories/managed-group.js
similarity index 100%
rename from addons/api/mirage/factories/managed-group.js
rename to addons/api/addon/mirage/factories/managed-group.js
diff --git a/addons/api/mirage/factories/policy.js b/addons/api/addon/mirage/factories/policy.js
similarity index 100%
rename from addons/api/mirage/factories/policy.js
rename to addons/api/addon/mirage/factories/policy.js
diff --git a/addons/api/mirage/factories/role.js b/addons/api/addon/mirage/factories/role.js
similarity index 100%
rename from addons/api/mirage/factories/role.js
rename to addons/api/addon/mirage/factories/role.js
diff --git a/addons/api/mirage/factories/scope.js b/addons/api/addon/mirage/factories/scope.js
similarity index 100%
rename from addons/api/mirage/factories/scope.js
rename to addons/api/addon/mirage/factories/scope.js
diff --git a/addons/api/mirage/factories/session-recording.js b/addons/api/addon/mirage/factories/session-recording.js
similarity index 100%
rename from addons/api/mirage/factories/session-recording.js
rename to addons/api/addon/mirage/factories/session-recording.js
diff --git a/addons/api/mirage/factories/session.js b/addons/api/addon/mirage/factories/session.js
similarity index 100%
rename from addons/api/mirage/factories/session.js
rename to addons/api/addon/mirage/factories/session.js
diff --git a/addons/api/mirage/factories/storage-bucket.js b/addons/api/addon/mirage/factories/storage-bucket.js
similarity index 100%
rename from addons/api/mirage/factories/storage-bucket.js
rename to addons/api/addon/mirage/factories/storage-bucket.js
diff --git a/addons/api/mirage/factories/target.js b/addons/api/addon/mirage/factories/target.js
similarity index 100%
rename from addons/api/mirage/factories/target.js
rename to addons/api/addon/mirage/factories/target.js
diff --git a/addons/api/mirage/factories/user.js b/addons/api/addon/mirage/factories/user.js
similarity index 100%
rename from addons/api/mirage/factories/user.js
rename to addons/api/addon/mirage/factories/user.js
diff --git a/addons/api/mirage/factories/worker.js b/addons/api/addon/mirage/factories/worker.js
similarity index 100%
rename from addons/api/mirage/factories/worker.js
rename to addons/api/addon/mirage/factories/worker.js
diff --git a/addons/api/mirage/generated/factories/account.js b/addons/api/addon/mirage/generated/factories/account.js
similarity index 100%
rename from addons/api/mirage/generated/factories/account.js
rename to addons/api/addon/mirage/generated/factories/account.js
diff --git a/addons/api/mirage/generated/factories/alias.js b/addons/api/addon/mirage/generated/factories/alias.js
similarity index 100%
rename from addons/api/mirage/generated/factories/alias.js
rename to addons/api/addon/mirage/generated/factories/alias.js
diff --git a/addons/api/mirage/generated/factories/auth-method.js b/addons/api/addon/mirage/generated/factories/auth-method.js
similarity index 100%
rename from addons/api/mirage/generated/factories/auth-method.js
rename to addons/api/addon/mirage/generated/factories/auth-method.js
diff --git a/addons/api/mirage/generated/factories/channel-recording.js b/addons/api/addon/mirage/generated/factories/channel-recording.js
similarity index 100%
rename from addons/api/mirage/generated/factories/channel-recording.js
rename to addons/api/addon/mirage/generated/factories/channel-recording.js
diff --git a/addons/api/mirage/generated/factories/connection-recording.js b/addons/api/addon/mirage/generated/factories/connection-recording.js
similarity index 100%
rename from addons/api/mirage/generated/factories/connection-recording.js
rename to addons/api/addon/mirage/generated/factories/connection-recording.js
diff --git a/addons/api/mirage/generated/factories/credential-library.js b/addons/api/addon/mirage/generated/factories/credential-library.js
similarity index 100%
rename from addons/api/mirage/generated/factories/credential-library.js
rename to addons/api/addon/mirage/generated/factories/credential-library.js
diff --git a/addons/api/mirage/generated/factories/credential-store.js b/addons/api/addon/mirage/generated/factories/credential-store.js
similarity index 100%
rename from addons/api/mirage/generated/factories/credential-store.js
rename to addons/api/addon/mirage/generated/factories/credential-store.js
diff --git a/addons/api/mirage/generated/factories/credential.js b/addons/api/addon/mirage/generated/factories/credential.js
similarity index 100%
rename from addons/api/mirage/generated/factories/credential.js
rename to addons/api/addon/mirage/generated/factories/credential.js
diff --git a/addons/api/mirage/generated/factories/group.js b/addons/api/addon/mirage/generated/factories/group.js
similarity index 100%
rename from addons/api/mirage/generated/factories/group.js
rename to addons/api/addon/mirage/generated/factories/group.js
diff --git a/addons/api/mirage/generated/factories/host-catalog.js b/addons/api/addon/mirage/generated/factories/host-catalog.js
similarity index 100%
rename from addons/api/mirage/generated/factories/host-catalog.js
rename to addons/api/addon/mirage/generated/factories/host-catalog.js
diff --git a/addons/api/mirage/generated/factories/host-set.js b/addons/api/addon/mirage/generated/factories/host-set.js
similarity index 100%
rename from addons/api/mirage/generated/factories/host-set.js
rename to addons/api/addon/mirage/generated/factories/host-set.js
diff --git a/addons/api/mirage/generated/factories/host.js b/addons/api/addon/mirage/generated/factories/host.js
similarity index 100%
rename from addons/api/mirage/generated/factories/host.js
rename to addons/api/addon/mirage/generated/factories/host.js
diff --git a/addons/api/mirage/generated/factories/managed-group.js b/addons/api/addon/mirage/generated/factories/managed-group.js
similarity index 100%
rename from addons/api/mirage/generated/factories/managed-group.js
rename to addons/api/addon/mirage/generated/factories/managed-group.js
diff --git a/addons/api/mirage/generated/factories/org.js b/addons/api/addon/mirage/generated/factories/org.js
similarity index 100%
rename from addons/api/mirage/generated/factories/org.js
rename to addons/api/addon/mirage/generated/factories/org.js
diff --git a/addons/api/mirage/generated/factories/policy.js b/addons/api/addon/mirage/generated/factories/policy.js
similarity index 100%
rename from addons/api/mirage/generated/factories/policy.js
rename to addons/api/addon/mirage/generated/factories/policy.js
diff --git a/addons/api/mirage/generated/factories/project.js b/addons/api/addon/mirage/generated/factories/project.js
similarity index 100%
rename from addons/api/mirage/generated/factories/project.js
rename to addons/api/addon/mirage/generated/factories/project.js
diff --git a/addons/api/mirage/generated/factories/role.js b/addons/api/addon/mirage/generated/factories/role.js
similarity index 100%
rename from addons/api/mirage/generated/factories/role.js
rename to addons/api/addon/mirage/generated/factories/role.js
diff --git a/addons/api/mirage/generated/factories/scope.js b/addons/api/addon/mirage/generated/factories/scope.js
similarity index 100%
rename from addons/api/mirage/generated/factories/scope.js
rename to addons/api/addon/mirage/generated/factories/scope.js
diff --git a/addons/api/mirage/generated/factories/session-recording.js b/addons/api/addon/mirage/generated/factories/session-recording.js
similarity index 100%
rename from addons/api/mirage/generated/factories/session-recording.js
rename to addons/api/addon/mirage/generated/factories/session-recording.js
diff --git a/addons/api/mirage/generated/factories/session.js b/addons/api/addon/mirage/generated/factories/session.js
similarity index 100%
rename from addons/api/mirage/generated/factories/session.js
rename to addons/api/addon/mirage/generated/factories/session.js
diff --git a/addons/api/mirage/generated/factories/storage-bucket.js b/addons/api/addon/mirage/generated/factories/storage-bucket.js
similarity index 100%
rename from addons/api/mirage/generated/factories/storage-bucket.js
rename to addons/api/addon/mirage/generated/factories/storage-bucket.js
diff --git a/addons/api/mirage/generated/factories/target.js b/addons/api/addon/mirage/generated/factories/target.js
similarity index 100%
rename from addons/api/mirage/generated/factories/target.js
rename to addons/api/addon/mirage/generated/factories/target.js
diff --git a/addons/api/mirage/generated/factories/user.js b/addons/api/addon/mirage/generated/factories/user.js
similarity index 100%
rename from addons/api/mirage/generated/factories/user.js
rename to addons/api/addon/mirage/generated/factories/user.js
diff --git a/addons/api/mirage/generated/factories/worker.js b/addons/api/addon/mirage/generated/factories/worker.js
similarity index 100%
rename from addons/api/mirage/generated/factories/worker.js
rename to addons/api/addon/mirage/generated/factories/worker.js
diff --git a/addons/api/mirage/helpers/bexpr-filter.js b/addons/api/addon/mirage/helpers/bexpr-filter.js
similarity index 100%
rename from addons/api/mirage/helpers/bexpr-filter.js
rename to addons/api/addon/mirage/helpers/bexpr-filter.js
diff --git a/addons/api/mirage/helpers/id.js b/addons/api/addon/mirage/helpers/id.js
similarity index 100%
rename from addons/api/mirage/helpers/id.js
rename to addons/api/addon/mirage/helpers/id.js
diff --git a/addons/api/mirage/helpers/permissions.js b/addons/api/addon/mirage/helpers/permissions.js
similarity index 100%
rename from addons/api/mirage/helpers/permissions.js
rename to addons/api/addon/mirage/helpers/permissions.js
diff --git a/addons/api/mirage/models/account.js b/addons/api/addon/mirage/models/account.js
similarity index 100%
rename from addons/api/mirage/models/account.js
rename to addons/api/addon/mirage/models/account.js
diff --git a/addons/api/mirage/models/alias.js b/addons/api/addon/mirage/models/alias.js
similarity index 100%
rename from addons/api/mirage/models/alias.js
rename to addons/api/addon/mirage/models/alias.js
diff --git a/addons/api/mirage/models/auth-method.js b/addons/api/addon/mirage/models/auth-method.js
similarity index 100%
rename from addons/api/mirage/models/auth-method.js
rename to addons/api/addon/mirage/models/auth-method.js
diff --git a/addons/api/mirage/models/base.js b/addons/api/addon/mirage/models/base.js
similarity index 100%
rename from addons/api/mirage/models/base.js
rename to addons/api/addon/mirage/models/base.js
diff --git a/addons/api/mirage/models/channel-recording.js b/addons/api/addon/mirage/models/channel-recording.js
similarity index 100%
rename from addons/api/mirage/models/channel-recording.js
rename to addons/api/addon/mirage/models/channel-recording.js
diff --git a/addons/api/mirage/models/connection-recording.js b/addons/api/addon/mirage/models/connection-recording.js
similarity index 100%
rename from addons/api/mirage/models/connection-recording.js
rename to addons/api/addon/mirage/models/connection-recording.js
diff --git a/addons/api/mirage/models/credential-library.js b/addons/api/addon/mirage/models/credential-library.js
similarity index 100%
rename from addons/api/mirage/models/credential-library.js
rename to addons/api/addon/mirage/models/credential-library.js
diff --git a/addons/api/mirage/models/credential-store.js b/addons/api/addon/mirage/models/credential-store.js
similarity index 100%
rename from addons/api/mirage/models/credential-store.js
rename to addons/api/addon/mirage/models/credential-store.js
diff --git a/addons/api/mirage/models/credential.js b/addons/api/addon/mirage/models/credential.js
similarity index 100%
rename from addons/api/mirage/models/credential.js
rename to addons/api/addon/mirage/models/credential.js
diff --git a/addons/api/mirage/models/group.js b/addons/api/addon/mirage/models/group.js
similarity index 100%
rename from addons/api/mirage/models/group.js
rename to addons/api/addon/mirage/models/group.js
diff --git a/addons/api/mirage/models/host-catalog.js b/addons/api/addon/mirage/models/host-catalog.js
similarity index 100%
rename from addons/api/mirage/models/host-catalog.js
rename to addons/api/addon/mirage/models/host-catalog.js
diff --git a/addons/api/mirage/models/host-set.js b/addons/api/addon/mirage/models/host-set.js
similarity index 100%
rename from addons/api/mirage/models/host-set.js
rename to addons/api/addon/mirage/models/host-set.js
diff --git a/addons/api/mirage/models/host.js b/addons/api/addon/mirage/models/host.js
similarity index 100%
rename from addons/api/mirage/models/host.js
rename to addons/api/addon/mirage/models/host.js
diff --git a/addons/api/mirage/models/managed-group.js b/addons/api/addon/mirage/models/managed-group.js
similarity index 100%
rename from addons/api/mirage/models/managed-group.js
rename to addons/api/addon/mirage/models/managed-group.js
diff --git a/addons/api/mirage/models/policy.js b/addons/api/addon/mirage/models/policy.js
similarity index 100%
rename from addons/api/mirage/models/policy.js
rename to addons/api/addon/mirage/models/policy.js
diff --git a/addons/api/mirage/models/role.js b/addons/api/addon/mirage/models/role.js
similarity index 100%
rename from addons/api/mirage/models/role.js
rename to addons/api/addon/mirage/models/role.js
diff --git a/addons/api/mirage/models/scope.js b/addons/api/addon/mirage/models/scope.js
similarity index 100%
rename from addons/api/mirage/models/scope.js
rename to addons/api/addon/mirage/models/scope.js
diff --git a/addons/api/mirage/models/session-recording.js b/addons/api/addon/mirage/models/session-recording.js
similarity index 100%
rename from addons/api/mirage/models/session-recording.js
rename to addons/api/addon/mirage/models/session-recording.js
diff --git a/addons/api/mirage/models/session.js b/addons/api/addon/mirage/models/session.js
similarity index 100%
rename from addons/api/mirage/models/session.js
rename to addons/api/addon/mirage/models/session.js
diff --git a/addons/api/mirage/models/storage-bucket.js b/addons/api/addon/mirage/models/storage-bucket.js
similarity index 100%
rename from addons/api/mirage/models/storage-bucket.js
rename to addons/api/addon/mirage/models/storage-bucket.js
diff --git a/addons/api/mirage/models/target.js b/addons/api/addon/mirage/models/target.js
similarity index 100%
rename from addons/api/mirage/models/target.js
rename to addons/api/addon/mirage/models/target.js
diff --git a/addons/api/mirage/models/user.js b/addons/api/addon/mirage/models/user.js
similarity index 100%
rename from addons/api/mirage/models/user.js
rename to addons/api/addon/mirage/models/user.js
diff --git a/addons/api/mirage/models/worker.js b/addons/api/addon/mirage/models/worker.js
similarity index 100%
rename from addons/api/mirage/models/worker.js
rename to addons/api/addon/mirage/models/worker.js
diff --git a/addons/api/mirage/route-handlers/auth.js b/addons/api/addon/mirage/route-handlers/auth.js
similarity index 100%
rename from addons/api/mirage/route-handlers/auth.js
rename to addons/api/addon/mirage/route-handlers/auth.js
diff --git a/addons/api/mirage/route-handlers/target.js b/addons/api/addon/mirage/route-handlers/target.js
similarity index 100%
rename from addons/api/mirage/route-handlers/target.js
rename to addons/api/addon/mirage/route-handlers/target.js
diff --git a/addons/api/mirage/scenarios/default.js b/addons/api/addon/mirage/scenarios/default.js
similarity index 100%
rename from addons/api/mirage/scenarios/default.js
rename to addons/api/addon/mirage/scenarios/default.js
diff --git a/addons/api/mirage/scenarios/ipc.js b/addons/api/addon/mirage/scenarios/ipc.js
similarity index 98%
rename from addons/api/mirage/scenarios/ipc.js
rename to addons/api/addon/mirage/scenarios/ipc.js
index 0339764c85..423a88e732 100644
--- a/addons/api/mirage/scenarios/ipc.js
+++ b/addons/api/addon/mirage/scenarios/ipc.js
@@ -22,6 +22,14 @@ export default function initializeMockIPC(server, config) {
 
     clusterUrl = null;
 
+    checkOS() {
+      return {
+        isLinux: false,
+        isMac: true,
+        isWindows: false,
+      };
+    }
+
     getClusterUrl() {
       return this.clusterUrl;
     }
@@ -273,7 +281,7 @@ export default function initializeMockIPC(server, config) {
    * We mock certain functions even in electron (e.g. hasMacOSChrome) when running
    * locally which will force a certain appearance regardless of platform
    */
-  if (config['ember-cli-mirage'].enabled && !isTesting) {
+  if (config.mirage?.enabled && !isTesting) {
     const mockIPC = new MockIPC();
 
     window.addEventListener('message', async function (event) {
diff --git a/addons/api/mirage/serializers/account.js b/addons/api/addon/mirage/serializers/account.js
similarity index 100%
rename from addons/api/mirage/serializers/account.js
rename to addons/api/addon/mirage/serializers/account.js
diff --git a/addons/api/mirage/serializers/alias.js b/addons/api/addon/mirage/serializers/alias.js
similarity index 100%
rename from addons/api/mirage/serializers/alias.js
rename to addons/api/addon/mirage/serializers/alias.js
diff --git a/addons/api/mirage/serializers/application.js b/addons/api/addon/mirage/serializers/application.js
similarity index 100%
rename from addons/api/mirage/serializers/application.js
rename to addons/api/addon/mirage/serializers/application.js
diff --git a/addons/api/mirage/serializers/auth-method.js b/addons/api/addon/mirage/serializers/auth-method.js
similarity index 100%
rename from addons/api/mirage/serializers/auth-method.js
rename to addons/api/addon/mirage/serializers/auth-method.js
diff --git a/addons/api/mirage/serializers/channel-recording.js b/addons/api/addon/mirage/serializers/channel-recording.js
similarity index 100%
rename from addons/api/mirage/serializers/channel-recording.js
rename to addons/api/addon/mirage/serializers/channel-recording.js
diff --git a/addons/api/mirage/serializers/connection-recording.js b/addons/api/addon/mirage/serializers/connection-recording.js
similarity index 100%
rename from addons/api/mirage/serializers/connection-recording.js
rename to addons/api/addon/mirage/serializers/connection-recording.js
diff --git a/addons/api/mirage/serializers/credential-library.js b/addons/api/addon/mirage/serializers/credential-library.js
similarity index 100%
rename from addons/api/mirage/serializers/credential-library.js
rename to addons/api/addon/mirage/serializers/credential-library.js
diff --git a/addons/api/mirage/serializers/credential-store.js b/addons/api/addon/mirage/serializers/credential-store.js
similarity index 100%
rename from addons/api/mirage/serializers/credential-store.js
rename to addons/api/addon/mirage/serializers/credential-store.js
diff --git a/addons/api/mirage/serializers/credential.js b/addons/api/addon/mirage/serializers/credential.js
similarity index 100%
rename from addons/api/mirage/serializers/credential.js
rename to addons/api/addon/mirage/serializers/credential.js
diff --git a/addons/api/mirage/serializers/group.js b/addons/api/addon/mirage/serializers/group.js
similarity index 100%
rename from addons/api/mirage/serializers/group.js
rename to addons/api/addon/mirage/serializers/group.js
diff --git a/addons/api/mirage/serializers/host-catalog.js b/addons/api/addon/mirage/serializers/host-catalog.js
similarity index 100%
rename from addons/api/mirage/serializers/host-catalog.js
rename to addons/api/addon/mirage/serializers/host-catalog.js
diff --git a/addons/api/mirage/serializers/host-set.js b/addons/api/addon/mirage/serializers/host-set.js
similarity index 100%
rename from addons/api/mirage/serializers/host-set.js
rename to addons/api/addon/mirage/serializers/host-set.js
diff --git a/addons/api/mirage/serializers/host.js b/addons/api/addon/mirage/serializers/host.js
similarity index 100%
rename from addons/api/mirage/serializers/host.js
rename to addons/api/addon/mirage/serializers/host.js
diff --git a/addons/api/mirage/serializers/managed-group.js b/addons/api/addon/mirage/serializers/managed-group.js
similarity index 100%
rename from addons/api/mirage/serializers/managed-group.js
rename to addons/api/addon/mirage/serializers/managed-group.js
diff --git a/addons/api/mirage/serializers/policy.js b/addons/api/addon/mirage/serializers/policy.js
similarity index 100%
rename from addons/api/mirage/serializers/policy.js
rename to addons/api/addon/mirage/serializers/policy.js
diff --git a/addons/api/mirage/serializers/role.js b/addons/api/addon/mirage/serializers/role.js
similarity index 100%
rename from addons/api/mirage/serializers/role.js
rename to addons/api/addon/mirage/serializers/role.js
diff --git a/addons/api/mirage/serializers/scope.js b/addons/api/addon/mirage/serializers/scope.js
similarity index 100%
rename from addons/api/mirage/serializers/scope.js
rename to addons/api/addon/mirage/serializers/scope.js
diff --git a/addons/api/mirage/serializers/session-recording.js b/addons/api/addon/mirage/serializers/session-recording.js
similarity index 100%
rename from addons/api/mirage/serializers/session-recording.js
rename to addons/api/addon/mirage/serializers/session-recording.js
diff --git a/addons/api/mirage/serializers/session.js b/addons/api/addon/mirage/serializers/session.js
similarity index 100%
rename from addons/api/mirage/serializers/session.js
rename to addons/api/addon/mirage/serializers/session.js
diff --git a/addons/api/mirage/serializers/storage-bucket.js b/addons/api/addon/mirage/serializers/storage-bucket.js
similarity index 100%
rename from addons/api/mirage/serializers/storage-bucket.js
rename to addons/api/addon/mirage/serializers/storage-bucket.js
diff --git a/addons/api/mirage/serializers/target.js b/addons/api/addon/mirage/serializers/target.js
similarity index 100%
rename from addons/api/mirage/serializers/target.js
rename to addons/api/addon/mirage/serializers/target.js
diff --git a/addons/api/mirage/serializers/user.js b/addons/api/addon/mirage/serializers/user.js
similarity index 100%
rename from addons/api/mirage/serializers/user.js
rename to addons/api/addon/mirage/serializers/user.js
diff --git a/addons/api/mirage/serializers/worker.js b/addons/api/addon/mirage/serializers/worker.js
similarity index 100%
rename from addons/api/mirage/serializers/worker.js
rename to addons/api/addon/mirage/serializers/worker.js
diff --git a/addons/api/index.js b/addons/api/index.js
index 9b305a68d5..677b633bf9 100644
--- a/addons/api/index.js
+++ b/addons/api/index.js
@@ -24,12 +24,36 @@ module.exports = {
     },
   },
 
+  included() {
+    this._super.included.apply(this, arguments);
+    const includeMirage = this._includeMirageInBuild();
+
+    // these are dependencies used our mirage code within the
+    // api addon and should not be included in production builds,
+    // after this addon has been migrated to a v2 addon this can
+    // be removed as the addon's dependencies will be statically
+    // analyzable
+    if (!includeMirage) {
+      // exclude mirage and dependencies from this addon that are used by mirage
+      this.options.autoImport.exclude.push(
+        'miragejs',
+        'sinon',
+        '@faker-js/faker',
+        'js-bexpr',
+      );
+    }
+  },
+
   treeForAddon() {
+    const includeMirage = this._includeMirageInBuild();
+
     // Exclude anything in the workers folder from being bundled in the final
     // build as we're manually bundling the files ourselves below.
     const tree = this._super.treeForAddon.apply(this, arguments);
     return funnel(tree, {
-      exclude: ['api/workers/**/*'],
+      exclude: ['api/workers/**/*', !includeMirage && 'api/mirage/**/*'].filter(
+        Boolean,
+      ),
     });
   },
 
@@ -70,4 +94,10 @@ module.exports = {
 
     return merge(trees);
   },
+
+  _includeMirageInBuild() {
+    const env = this.parent.app?.env ?? 'production';
+    const config = this.project.config(env);
+    return Boolean(config.mirage?.enabled);
+  },
 };
diff --git a/addons/api/package.json b/addons/api/package.json
index 76dcb6904e..58b774a10c 100644
--- a/addons/api/package.json
+++ b/addons/api/package.json
@@ -36,11 +36,10 @@
     "ember-can": "^4.2.0",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.3.0",
-    "ember-cli-mirage": "^3.0.3",
     "ember-data": "~5.3.12",
     "esbuild": "^0.25.4",
-    "miragejs": "^0.1.48",
     "promise-worker-bi": "^5.0.1",
+    "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "tracked-built-ins": "^4.0.0",
     "uuid": "^11.0.3"
   },
@@ -51,7 +50,6 @@
     "@ember/test-helpers": "^5.2.1",
     "@ember/test-waiters": "^4.1.0",
     "@embroider/test-setup": "^4.0.0",
-    "@faker-js/faker": "^8.0.2",
     "@glimmer/component": "^2.0.0",
     "@glimmer/tracking": "^1.1.2",
     "broccoli-asset-rev": "^3.0.0",
@@ -64,6 +62,7 @@
     "ember-cli-sri": "^2.1.1",
     "ember-cli-terser": "^4.0.2",
     "ember-exam": "^8.0.0",
+    "ember-get-config": "^2.1.1",
     "ember-load-initializers": "^2.1.2",
     "ember-page-title": "^8.2.3",
     "ember-qunit": "^8.1.0",
@@ -77,16 +76,16 @@
     "eslint-plugin-ember": "^12.2.1",
     "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-qunit": "^8.1.2",
-    "js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
     "loader.js": "^4.7.0",
     "prettier": "^3.3.3",
     "qunit": "^2.22.0",
     "qunit-dom": "^3.2.1",
-    "sinon": "^19.0.2",
     "webpack": "^5.95.0"
   },
   "peerDependencies": {
+    "@faker-js/faker": "^8.0.2",
     "ember-source": ">= 4.0.0",
+    "miragejs": "^0.1.48",
     "sinon": "^19.0.2"
   },
   "engines": {
diff --git a/addons/api/tests/dummy/config/environment.js b/addons/api/tests/dummy/config/environment.js
index 565340d1e8..d4d3a031fa 100644
--- a/addons/api/tests/dummy/config/environment.js
+++ b/addons/api/tests/dummy/config/environment.js
@@ -29,8 +29,8 @@ module.exports = function (environment) {
       namespace: 'v1',
     },
 
-    'ember-cli-mirage': {
-      directory: './mirage',
+    mirage: {
+      enabled: true
     },
   };
 
diff --git a/addons/api/tests/helpers/index.js b/addons/api/tests/helpers/index.js
index b4c7ee08da..45e41214e9 100644
--- a/addons/api/tests/helpers/index.js
+++ b/addons/api/tests/helpers/index.js
@@ -29,7 +29,6 @@ function setupApplicationTest(hooks, options) {
   // from other addons:
   //
   // setupIntl(hooks, 'en-us'); // ember-intl
-  // setupMirage(hooks); // ember-cli-mirage
 }
 
 function setupRenderingTest(hooks, options) {
diff --git a/addons/api/tests/unit/adapters/application-test.js b/addons/api/tests/unit/adapters/application-test.js
index f6cfec180f..adda813bab 100644
--- a/addons/api/tests/unit/adapters/application-test.js
+++ b/addons/api/tests/unit/adapters/application-test.js
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import RESTAdapter from '@ember-data/adapter/rest';
 import { InvalidError } from '@ember-data/adapter/error';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { Response } from 'miragejs';
 
 module('Unit | Adapter | application', function (hooks) {
diff --git a/addons/api/tests/unit/handlers/sqlite-handler-test.js b/addons/api/tests/unit/handlers/sqlite-handler-test.js
index 456daccc3d..a0e9537b98 100644
--- a/addons/api/tests/unit/handlers/sqlite-handler-test.js
+++ b/addons/api/tests/unit/handlers/sqlite-handler-test.js
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import SqliteHandler from 'api/handlers/sqlite-handler';
 import RequestManager from '@ember-data/request';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { faker } from '@faker-js/faker';
 import sinon from 'sinon';
 import { assert } from '@ember/debug';
diff --git a/addons/api/tests/unit/models/auth-method-test.js b/addons/api/tests/unit/models/auth-method-test.js
index 11c19af704..651452c59f 100644
--- a/addons/api/tests/unit/models/auth-method-test.js
+++ b/addons/api/tests/unit/models/auth-method-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import {
   TYPE_AUTH_METHOD_PASSWORD,
   TYPE_AUTH_METHOD_OIDC,
diff --git a/addons/api/tests/unit/models/base-test.js b/addons/api/tests/unit/models/base-test.js
index 8b628e44f7..40c962697e 100644
--- a/addons/api/tests/unit/models/base-test.js
+++ b/addons/api/tests/unit/models/base-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 module('Unit | Model | base', function (hooks) {
   setupTest(hooks);
diff --git a/addons/api/tests/unit/models/group-test.js b/addons/api/tests/unit/models/group-test.js
index 12261009f0..daf4427345 100644
--- a/addons/api/tests/unit/models/group-test.js
+++ b/addons/api/tests/unit/models/group-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 module('Unit | Model | group', function (hooks) {
   setupTest(hooks);
diff --git a/addons/api/tests/unit/models/host-set-test.js b/addons/api/tests/unit/models/host-set-test.js
index 4f473bbdb2..04a0e621f9 100644
--- a/addons/api/tests/unit/models/host-set-test.js
+++ b/addons/api/tests/unit/models/host-set-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 module('Unit | Model | host set', function (hooks) {
   setupTest(hooks);
diff --git a/addons/api/tests/unit/models/role-test.js b/addons/api/tests/unit/models/role-test.js
index 6636753027..6a8095fdef 100644
--- a/addons/api/tests/unit/models/role-test.js
+++ b/addons/api/tests/unit/models/role-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import {
   GRANT_SCOPE_THIS,
   GRANT_SCOPE_CHILDREN,
diff --git a/addons/api/tests/unit/models/scope-test.js b/addons/api/tests/unit/models/scope-test.js
index 809e77c677..abf9263fbe 100644
--- a/addons/api/tests/unit/models/scope-test.js
+++ b/addons/api/tests/unit/models/scope-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 module('Unit | Model | scope', function (hooks) {
   setupTest(hooks);
diff --git a/addons/api/tests/unit/models/session-recording-test.js b/addons/api/tests/unit/models/session-recording-test.js
index 266e495413..351b48f09b 100644
--- a/addons/api/tests/unit/models/session-recording-test.js
+++ b/addons/api/tests/unit/models/session-recording-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { TYPE_SESSION_RECORDING_SSH } from 'api/models/session-recording';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import {
   STATE_SESSION_RECORDING_AVAILABLE,
   STATE_SESSION_RECORDING_STARTED,
diff --git a/addons/api/tests/unit/models/target-test.js b/addons/api/tests/unit/models/target-test.js
index f625f4c721..06bccfa3d3 100644
--- a/addons/api/tests/unit/models/target-test.js
+++ b/addons/api/tests/unit/models/target-test.js
@@ -5,12 +5,12 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
 import {
   TYPE_TARGET_TCP,
   TYPE_TARGET_SSH,
   TYPE_TARGET_RDP,
 } from 'api/models/target';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 module('Unit | Model | target', function (hooks) {
   setupTest(hooks);
diff --git a/addons/api/tests/unit/models/user-test.js b/addons/api/tests/unit/models/user-test.js
index 8c33530ca2..460d8cd84c 100644
--- a/addons/api/tests/unit/models/user-test.js
+++ b/addons/api/tests/unit/models/user-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 module('Unit | Model | user', function (hooks) {
   setupTest(hooks);
diff --git a/addons/api/tests/unit/models/worker-test.js b/addons/api/tests/unit/models/worker-test.js
index dc22a60dfd..b54d57e367 100644
--- a/addons/api/tests/unit/models/worker-test.js
+++ b/addons/api/tests/unit/models/worker-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { TYPE_WORKER_PKI } from 'api/models/worker';
 
 module('Unit | Model | worker', function (hooks) {
diff --git a/addons/api/tests/unit/serializers/auth-method-test.js b/addons/api/tests/unit/serializers/auth-method-test.js
index 99578e7a35..677b2a3382 100644
--- a/addons/api/tests/unit/serializers/auth-method-test.js
+++ b/addons/api/tests/unit/serializers/auth-method-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 import {
   TYPE_AUTH_METHOD_PASSWORD,
diff --git a/addons/auth/tests/helpers/index.js b/addons/auth/tests/helpers/index.js
index b4c7ee08da..45e41214e9 100644
--- a/addons/auth/tests/helpers/index.js
+++ b/addons/auth/tests/helpers/index.js
@@ -29,7 +29,6 @@ function setupApplicationTest(hooks, options) {
   // from other addons:
   //
   // setupIntl(hooks, 'en-us'); // ember-intl
-  // setupMirage(hooks); // ember-cli-mirage
 }
 
 function setupRenderingTest(hooks, options) {
diff --git a/addons/core/tests/dummy/config/environment.js b/addons/core/tests/dummy/config/environment.js
index f9bc418c30..edd6b848f4 100644
--- a/addons/core/tests/dummy/config/environment.js
+++ b/addons/core/tests/dummy/config/environment.js
@@ -41,8 +41,8 @@ module.exports = function (environment) {
       namespace: 'v1',
     },
 
-    'ember-cli-mirage': {
-      directory: '../api/mirage',
+    mirage: {
+      enabled: true,
     },
 
     enableConfirmService: false,
diff --git a/addons/core/tests/helpers/index.js b/addons/core/tests/helpers/index.js
index b4c7ee08da..45e41214e9 100644
--- a/addons/core/tests/helpers/index.js
+++ b/addons/core/tests/helpers/index.js
@@ -29,7 +29,6 @@ function setupApplicationTest(hooks, options) {
   // from other addons:
   //
   // setupIntl(hooks, 'en-us'); // ember-intl
-  // setupMirage(hooks); // ember-cli-mirage
 }
 
 function setupRenderingTest(hooks, options) {
diff --git a/addons/core/tests/unit/authenticators/password-test.js b/addons/core/tests/unit/authenticators/password-test.js
index a0fda881a0..15dda3eec0 100644
--- a/addons/core/tests/unit/authenticators/password-test.js
+++ b/addons/core/tests/unit/authenticators/password-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { Response } from 'miragejs';
 
 module('Unit | Authenticator | password', function (hooks) {
diff --git a/addons/rose/tests/helpers/index.js b/addons/rose/tests/helpers/index.js
index b4c7ee08da..45e41214e9 100644
--- a/addons/rose/tests/helpers/index.js
+++ b/addons/rose/tests/helpers/index.js
@@ -29,7 +29,6 @@ function setupApplicationTest(hooks, options) {
   // from other addons:
   //
   // setupIntl(hooks, 'en-us'); // ember-intl
-  // setupMirage(hooks); // ember-cli-mirage
 }
 
 function setupRenderingTest(hooks, options) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 80067e7616..6bb9c87f20 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -58,6 +58,9 @@ importers:
       '@ember/string':
         specifier: ^4.0.0
         version: 4.0.1
+      '@faker-js/faker':
+        specifier: ^8.0.2
+        version: 8.4.1
       '@sqlite.org/sqlite-wasm':
         specifier: ^3.49.1-build4
         version: 3.49.1-build4
@@ -85,21 +88,24 @@ importers:
       ember-cli-htmlbars:
         specifier: ^6.3.0
         version: 6.3.0
-      ember-cli-mirage:
-        specifier: ^3.0.3
-        version: 3.0.4(4aae64382352ae0e9635b2848df9b5e9)
       ember-data:
         specifier: ~5.3.12
         version: 5.3.13(@ember/string@4.0.1)(@ember/test-helpers@5.2.2(@babel/core@7.27.1)(@glint/template@1.5.2))(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))(qunit@2.24.1)
       esbuild:
         specifier: ^0.25.4
         version: 0.25.9
+      js-bexpr:
+        specifier: hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1
+        version: https://codeload.github.com/hashicorp/js-bexpr/tar.gz/9b4a4b54d85eba67fdfc0990133d1518d890b1e1
       miragejs:
         specifier: ^0.1.48
         version: 0.1.48
       promise-worker-bi:
         specifier: ^5.0.1
         version: 5.0.1
+      sinon:
+        specifier: ^19.0.2
+        version: 19.0.5
       tracked-built-ins:
         specifier: ^4.0.0
         version: 4.0.0(@babel/core@7.27.1)
@@ -125,9 +131,6 @@ importers:
       '@embroider/test-setup':
         specifier: ^4.0.0
         version: 4.0.0
-      '@faker-js/faker':
-        specifier: ^8.0.2
-        version: 8.4.1
       '@glimmer/component':
         specifier: ^2.0.0
         version: 2.0.0
@@ -164,6 +167,9 @@ importers:
       ember-exam:
         specifier: ^8.0.0
         version: 8.0.0(@glint/template@1.5.2)(ember-qunit@8.1.1(@ember/test-helpers@5.2.2(@babel/core@7.27.1)(@glint/template@1.5.2))(@glint/template@1.5.2)(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))(qunit@2.24.1))(qunit@2.24.1)(webpack@5.99.8(esbuild@0.25.9))
+      ember-get-config:
+        specifier: ^2.1.1
+        version: 2.1.1(@glint/template@1.5.2)
       ember-load-initializers:
         specifier: ^2.1.2
         version: 2.1.2(@babel/core@7.27.1)
@@ -203,9 +209,6 @@ importers:
       eslint-plugin-qunit:
         specifier: ^8.1.2
         version: 8.1.2(eslint@8.57.1)
-      js-bexpr:
-        specifier: hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1
-        version: https://codeload.github.com/hashicorp/js-bexpr/tar.gz/9b4a4b54d85eba67fdfc0990133d1518d890b1e1
       loader.js:
         specifier: ^4.7.0
         version: 4.7.0
@@ -218,9 +221,6 @@ importers:
       qunit-dom:
         specifier: ^3.2.1
         version: 3.4.0
-      sinon:
-        specifier: ^19.0.2
-        version: 19.0.5
       webpack:
         specifier: ^5.95.0
         version: 5.99.8(esbuild@0.25.9)
@@ -4714,26 +4714,6 @@ packages:
     resolution: {integrity: sha512-QkLGcYv1WRK35g4MWu/uIeJ5Suk2eJXKtZ+8s+qE7C9INmpCPyPxzaqZABquYzcWNzIdw6kYwz3NWAFdKYFxwg==}
     engines: {node: ^4.5 || 6.* || >= 7.*}
 
-  ember-cli-mirage@3.0.4:
-    resolution: {integrity: sha512-JpfZJIrvUAcwOVQ44aAzlYSbGiO4/nqnVAbzAKU4kztqgYvYGBa27FX5WxfpIGZMBdnt6OKh78rsimChWo6f/Q==}
-    engines: {node: 16.* || >= 18}
-    peerDependencies:
-      '@ember-data/model': '*'
-      '@ember/test-helpers': '*'
-      ember-data: '*'
-      ember-qunit: '*'
-      ember-source: '>= 3.28.0'
-      miragejs: ^0.1.43
-    peerDependenciesMeta:
-      '@ember-data/model':
-        optional: true
-      '@ember/test-helpers':
-        optional: true
-      ember-data:
-        optional: true
-      ember-qunit:
-        optional: true
-
   ember-cli-normalize-entity-name@1.0.0:
     resolution: {integrity: sha512-rF4P1rW2P1gVX1ynZYPmuIf7TnAFDiJmIUFI1Xz16VYykUAyiOCme0Y22LeZq8rTzwBMiwBwoE3RO4GYWehXZA==}
 
@@ -10392,7 +10372,7 @@ snapshots:
       '@ember-data/request-utils': 5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-cli-path-utils: 1.0.0
@@ -10409,7 +10389,7 @@ snapshots:
       '@ember-data/request-utils': 5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
@@ -10420,7 +10400,7 @@ snapshots:
   '@ember-data/graph@5.3.13(62aa5be71c8e28cbbe1a1ab9964e415b)':
     dependencies:
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
@@ -10433,7 +10413,7 @@ snapshots:
       '@ember-data/graph': 5.3.13(62aa5be71c8e28cbbe1a1ab9964e415b)
       '@ember-data/request-utils': 5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       fuse.js: 7.1.0
@@ -10448,7 +10428,7 @@ snapshots:
       '@ember-data/request-utils': 5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember/test-waiters': 4.1.0(@glint/template@1.5.2)
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
@@ -10466,7 +10446,7 @@ snapshots:
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/tracking': 5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-cli-string-utils: 1.1.0
@@ -10482,7 +10462,7 @@ snapshots:
 
   '@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))':
     dependencies:
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
@@ -10496,7 +10476,7 @@ snapshots:
   '@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))':
     dependencies:
       '@ember/test-waiters': 4.1.0(@glint/template@1.5.2)
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
     transitivePeerDependencies:
@@ -10511,7 +10491,7 @@ snapshots:
       '@ember-data/request-utils': 5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-cli-path-utils: 1.0.0
@@ -10527,7 +10507,7 @@ snapshots:
       '@ember-data/request': 5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))
       '@ember-data/request-utils': 5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/tracking': 5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
@@ -10537,7 +10517,7 @@ snapshots:
 
   '@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))':
     dependencies:
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
@@ -11795,7 +11775,7 @@ snapshots:
   '@warp-drive/build-config@0.0.3(@glint/template@1.5.2)':
     dependencies:
       '@embroider/addon-shim': 1.10.0
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       babel-import-util: 2.1.1
       semver: 7.7.2
     transitivePeerDependencies:
@@ -11804,7 +11784,7 @@ snapshots:
 
   '@warp-drive/core-types@0.0.3(@glint/template@1.5.2)':
     dependencies:
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
     transitivePeerDependencies:
       - '@glint/template'
@@ -13851,29 +13831,6 @@ snapshots:
 
   ember-cli-lodash-subset@2.0.1: {}
 
-  ember-cli-mirage@3.0.4(4aae64382352ae0e9635b2848df9b5e9):
-    dependencies:
-      '@babel/core': 7.27.1
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
-      broccoli-file-creator: 2.1.1
-      broccoli-funnel: 3.0.8
-      broccoli-merge-trees: 4.2.0
-      ember-auto-import: 2.10.0(@glint/template@1.5.2)(webpack@5.99.8(esbuild@0.25.9))
-      ember-cli-babel: 8.2.0(@babel/core@7.27.1)
-      ember-get-config: 2.1.1(@glint/template@1.5.2)
-      ember-inflector: 4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
-      ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
-      miragejs: 0.1.48
-    optionalDependencies:
-      '@ember-data/model': 5.3.13(7234f3c6c8908f8ca3320dc27c62478e)
-      '@ember/test-helpers': 5.2.2(@babel/core@7.27.1)(@glint/template@1.5.2)
-      ember-data: 5.3.13(@ember/string@4.0.1)(@ember/test-helpers@5.2.2(@babel/core@7.27.1)(@glint/template@1.5.2))(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))(qunit@2.24.1)
-      ember-qunit: 8.1.1(@ember/test-helpers@5.2.2(@babel/core@7.27.1)(@glint/template@1.5.2))(@glint/template@1.5.2)(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))(qunit@2.24.1)
-    transitivePeerDependencies:
-      - '@glint/template'
-      - supports-color
-      - webpack
-
   ember-cli-normalize-entity-name@1.0.0:
     dependencies:
       silent-error: 1.1.1
@@ -14210,7 +14167,7 @@ snapshots:
       '@ember-data/store': 5.3.13(@ember-data/request-utils@5.3.13(@ember/string@4.0.1)(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-inflector@4.0.3(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@ember-data/request@5.3.13(@ember/test-waiters@4.1.0(@glint/template@1.5.2))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2)))(@ember-data/tracking@5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))))(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember-data/tracking': 5.3.13(@glint/template@1.5.2)(@warp-drive/core-types@0.0.3(@glint/template@1.5.2))(ember-source@5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9)))
       '@ember/edition-utils': 1.2.0
-      '@embroider/macros': 1.18.0(@glint/template@1.5.2)
+      '@embroider/macros': 1.19.3(@glint/template@1.5.2)
       '@warp-drive/build-config': 0.0.3(@glint/template@1.5.2)
       '@warp-drive/core-types': 0.0.3(@glint/template@1.5.2)
       ember-source: 5.12.0(@glimmer/component@2.0.0)(@glint/template@1.5.2)(rsvp@4.8.5)(webpack@5.99.8(esbuild@0.25.9))
diff --git a/ui/admin/app/app.js b/ui/admin/app/app.js
index e9a333fa75..d42bf8eb03 100644
--- a/ui/admin/app/app.js
+++ b/ui/admin/app/app.js
@@ -7,6 +7,12 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from 'admin/config/environment';
+import {
+  macroCondition,
+  importSync,
+  getOwnConfig,
+  isTesting,
+} from '@embroider/macros';
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
@@ -15,3 +21,8 @@ export default class App extends Application {
 }
 
 loadInitializers(App, config.modulePrefix);
+
+if (macroCondition(getOwnConfig().startMirageWithApp && !isTesting())) {
+  const startServer = importSync('api/mirage/config').default;
+  startServer({});
+}
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index cb3a04d750..1beb157751 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -139,10 +139,6 @@ module.exports = function (environment) {
       },
     },
 
-    'ember-cli-mirage': {
-      directory: '../../addons/api/mirage',
-    },
-
     flashMessageDefaults: {
       timeout: 4000,
     },
@@ -157,9 +153,11 @@ module.exports = function (environment) {
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
 
-    ENV['ember-cli-mirage'].enabled = process.env.ENABLE_MIRAGE
-      ? JSON.parse(process.env.ENABLE_MIRAGE)
-      : true;
+    ENV.mirage = {
+      enabled: process.env.ENABLE_MIRAGE
+        ? JSON.parse(process.env.ENABLE_MIRAGE)
+        : true,
+    };
 
     // Default edition in development
     ENV.features.defaultEdition = 'enterprise';
@@ -197,6 +195,12 @@ module.exports = function (environment) {
 
     ENV.ENABLE_A11Y_AUDIT = ENABLE_A11Y_AUDIT;
     ENV.COLOR_THEME = COLOR_THEME;
+
+    ENV.mirage = {
+      enabled: process.env.ENABLE_MIRAGE
+        ? JSON.parse(process.env.ENABLE_MIRAGE)
+        : true,
+    };
   }
 
   if (environment === 'production') {
diff --git a/ui/admin/ember-cli-build.js b/ui/admin/ember-cli-build.js
index 7a98767e1c..26a9b94bbe 100644
--- a/ui/admin/ember-cli-build.js
+++ b/ui/admin/ember-cli-build.js
@@ -9,6 +9,8 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = async function (defaults) {
   const { setConfig } = await import('@warp-drive/build-config');
+  const { EMBER_ENV } = process.env;
+  var config = require('./config/environment')(EMBER_ENV);
 
   const app = new EmberApp(defaults, {
     hinting: false,
@@ -31,6 +33,11 @@ module.exports = async function (defaults) {
     api: {
       enableSqlite: true,
     },
+    '@embroider/macros': {
+      setOwnConfig: {
+        startMirageWithApp: config.mirage?.enabled ?? false,
+      },
+    },
   });
 
   // TODO: The deprecations object can be removed in ember-data 6.0.
diff --git a/ui/admin/tests/helpers/index.js b/ui/admin/tests/helpers/index.js
index 31e6d0d349..94c0a1a6cc 100644
--- a/ui/admin/tests/helpers/index.js
+++ b/ui/admin/tests/helpers/index.js
@@ -9,7 +9,7 @@ import {
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
 import { authenticateSession } from 'ember-simple-auth/test-support';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 // This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
diff --git a/ui/admin/tests/integration/components/scope-picker/index-test.js b/ui/admin/tests/integration/components/scope-picker/index-test.js
index 3e3566383a..df88f631f7 100644
--- a/ui/admin/tests/integration/components/scope-picker/index-test.js
+++ b/ui/admin/tests/integration/components/scope-picker/index-test.js
@@ -8,7 +8,7 @@ import { setupRenderingTest } from 'admin/tests/helpers';
 import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { click } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 
diff --git a/ui/admin/tests/unit/controllers/account/change-password-test.js b/ui/admin/tests/unit/controllers/account/change-password-test.js
index 20369c7e42..0c0e9704f8 100644
--- a/ui/admin/tests/unit/controllers/account/change-password-test.js
+++ b/ui/admin/tests/unit/controllers/account/change-password-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/onboarding/index-test.js b/ui/admin/tests/unit/controllers/onboarding/index-test.js
index bc9670b15e..52735730ed 100644
--- a/ui/admin/tests/unit/controllers/onboarding/index-test.js
+++ b/ui/admin/tests/unit/controllers/onboarding/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { currentURL, waitUntil, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import { TYPE_TARGET_TCP } from 'api/models/target';
diff --git a/ui/admin/tests/unit/controllers/onboarding/success-test.js b/ui/admin/tests/unit/controllers/onboarding/success-test.js
index d4851b08dd..9eab0afb37 100644
--- a/ui/admin/tests/unit/controllers/onboarding/success-test.js
+++ b/ui/admin/tests/unit/controllers/onboarding/success-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { currentURL, waitUntil, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/create-test.js b/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/create-test.js
index bc07d9f316..e93f725be0 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/create-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/create-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
 module(
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/index-test.js
index ee24fbb5b2..aee5a0b0a1 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/add-storage-policy/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
 module(
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/aliases/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/aliases/index-test.js
index f008be8c30..400f8a77de 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/aliases/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/aliases/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit, waitUntil } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password-test.js b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password-test.js
index 5cb405eb8a..c1a2caa037 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import { TYPE_AUTH_METHOD_PASSWORD } from 'api/models/auth-method';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/index-test.js
index 5b607c6d7a..f5558ae80b 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/accounts/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index-test.js
index d8930ea688..3a1b5d52c9 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { visit } from '@ember/test-helpers';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/index-test.js
index ee192a053d..69299c4133 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/auth-methods/index-test.js
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { waitUntil } from '@ember/test-helpers';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js
index 6926255c4e..e0269b6597 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit, currentURL, settled } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 module(
   'Unit | Controller | scopes/scope/authenticate/method/index',
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js
index 63184481db..88245ade8c 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/index-test.js
index bdd98687d2..ccbd307aa1 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/index-test.js
index 158907e580..291aa3cb1c 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupIntl } from 'ember-intl/test-support';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { waitUntil, visit } from '@ember/test-helpers';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/groups/group/add-members-test.js b/ui/admin/tests/unit/controllers/scopes/scope/groups/group/add-members-test.js
index 85d1f94112..586c21b654 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/groups/group/add-members-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/groups/group/add-members-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/groups/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/groups/index-test.js
index b64defcacd..6a12dddc3c 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/groups/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/groups/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { waitUntil, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts-test.js b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts-test.js
index 8821ea9fa4..24b5d9e594 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host-test.js b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host-test.js
index ba584d7b26..5955a753fb 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index-test.js
index d9c218e3e5..a4d208a13e 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index-test.js
index c25faf3b41..dced9d23a6 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import { TYPE_HOST_CATALOG_STATIC } from 'api/models/host-catalog';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/index-test.js
index 0ac661a031..6521a80163 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/host-catalogs/index-test.js
@@ -7,7 +7,7 @@ import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupIntl } from 'ember-intl/test-support';
 import { waitUntil, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/index-test.js
index f385088f91..9bc1794851 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/policies/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/policies/index-test.js
index 106089b30d..31698ad4e7 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/policies/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/policies/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/roles/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/roles/index-test.js
index e97d09f5a7..5d0afbb534 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/roles/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/roles/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { waitUntil, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/add-principals-test.js b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/add-principals-test.js
index d6f34ae87a..663bfde0df 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/add-principals-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/add-principals-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/grants-test.js b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/grants-test.js
index 74fb73978b..da6f195f22 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/grants-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/grants-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
 module('Unit | Controller | scopes/scope/roles/role/grants', function (hooks) {
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/index-test.js
index 8c123a5612..a1adae46d9 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit, currentURL, waitUntil } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import { GRANT_SCOPE_THIS } from 'api/models/role';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes-test.js b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes-test.js
index 57db1f8f44..8e9c2a61e2 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit, currentURL, waitUntil } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects-test.js b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects-test.js
index b9731e1bda..19f92c4080 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { currentURL, visit, waitUntil } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/scopes-test.js b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/scopes-test.js
index deb2b9549e..74d4933094 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/roles/role/scopes-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/roles/role/scopes-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit, waitUntil } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/index-test.js
index 58c913d419..8c1bb21bbd 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { waitUntil } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import sinon from 'sinon';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index-test.js
index e8a8909977..4082108e47 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import {
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/storage-buckets/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/storage-buckets/index-test.js
index e7a2b3444c..f07d35f407 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/storage-buckets/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/storage-buckets/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/index-test.js
index 75a7a48539..afe915f53b 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit, waitUntil } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-brokered-credential-sources-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-brokered-credential-sources-test.js
index db3ff4a1cb..bc1b611cd9 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-brokered-credential-sources-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-brokered-credential-sources-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { currentURL, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import {
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js
index 5e2e8aeacf..e3b2847e3c 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-host-sources-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { currentURL, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-injected-application-credential-sources-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-injected-application-credential-sources-test.js
index 8c3e47ff56..e435591f0b 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-injected-application-credential-sources-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/add-injected-application-credential-sources-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { currentURL, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import {
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket-test.js
index 8856543c27..5154bf935e 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/index-test.js
index 107a2956f3..37e0837d4b 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/targets/target/enable-session-recording/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/users/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/users/index-test.js
index 1416498cc4..8026cddcec 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/users/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/users/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { waitUntil, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupSqlite } from 'api/test-support/helpers/sqlite';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/users/user/add-accounts-test.js b/ui/admin/tests/unit/controllers/scopes/scope/users/user/add-accounts-test.js
index 9e787ac96c..253a70ccc2 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/users/user/add-accounts-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/users/user/add-accounts-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
 module(
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/workers/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/workers/index-test.js
index 47cad4448a..adfb59e178 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/workers/index-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/workers/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/workers/new-test.js b/ui/admin/tests/unit/controllers/scopes/scope/workers/new-test.js
index a7328b4c08..9df1c2895a 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/workers/new-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/workers/new-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
 module('Unit | Controller | scopes/scope/workers/new', function (hooks) {
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/create-tags-test.js b/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/create-tags-test.js
index 50d89d20ac..21b5d1c121 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/create-tags-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/create-tags-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { currentURL, visit } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 
 module(
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/tags-test.js b/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/tags-test.js
index 291b87c9fa..c84180b104 100644
--- a/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/tags-test.js
+++ b/ui/admin/tests/unit/controllers/scopes/scope/workers/worker/tags-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { visit } from '@ember/test-helpers';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { setupIntl } from 'ember-intl/test-support';
 import { authenticateSession } from 'ember-simple-auth/test-support';
 import { HCP_MANAGED_KEY } from 'api/models/worker';
diff --git a/ui/desktop/app/app.js b/ui/desktop/app/app.js
index 43db29bdd3..da6c45930a 100644
--- a/ui/desktop/app/app.js
+++ b/ui/desktop/app/app.js
@@ -7,6 +7,12 @@ import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
+import {
+  macroCondition,
+  getOwnConfig,
+  importSync,
+  isTesting,
+} from '@embroider/macros';
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;
@@ -15,3 +21,8 @@ export default class App extends Application {
 }
 
 loadInitializers(App, config.modulePrefix);
+
+if (macroCondition(getOwnConfig().startMirageWithApp && !isTesting())) {
+  const startServer = importSync('api/mirage/config').default;
+  startServer({});
+}
diff --git a/ui/desktop/config/environment.js b/ui/desktop/config/environment.js
index fce1ed8fab..7702899734 100644
--- a/ui/desktop/config/environment.js
+++ b/ui/desktop/config/environment.js
@@ -33,11 +33,6 @@ module.exports = function (environment) {
       ? JSON.parse(process.env.EMBER_CLI_ELECTRON)
       : false,
 
-    'ember-cli-mirage': {
-      //enabled: ENABLE_MIRAGE,
-      directory: '../../addons/api/mirage',
-    },
-
     api: {
       // there is no default API host in desktop
       //host: API_HOST,
@@ -79,9 +74,11 @@ module.exports = function (environment) {
     // usually the same as the application origin.
     ENV.autoOrigin = true;
 
-    ENV['ember-cli-mirage'].enabled = process.env.ENABLE_MIRAGE
-      ? JSON.parse(process.env.ENABLE_MIRAGE)
-      : true;
+    ENV.mirage = {
+      enabled: process.env.ENABLE_MIRAGE
+        ? JSON.parse(process.env.ENABLE_MIRAGE)
+        : true,
+    };
 
     ENV.ENABLE_A11Y_AUDIT = ENABLE_A11Y_AUDIT;
     ENV.COLOR_THEME = COLOR_THEME;
@@ -114,6 +111,12 @@ module.exports = function (environment) {
 
     ENV.ENABLE_A11Y_AUDIT = ENABLE_A11Y_AUDIT;
     ENV.COLOR_THEME = COLOR_THEME;
+
+    ENV.mirage = {
+      enabled: process.env.ENABLE_MIRAGE
+        ? JSON.parse(process.env.ENABLE_MIRAGE)
+        : true,
+    };
   }
 
   if (environment === 'production') {
diff --git a/ui/desktop/ember-cli-build.js b/ui/desktop/ember-cli-build.js
index 2f8b4b8fa5..acd7cd7029 100644
--- a/ui/desktop/ember-cli-build.js
+++ b/ui/desktop/ember-cli-build.js
@@ -9,6 +9,8 @@ const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = async function (defaults) {
   const { setConfig } = await import('@warp-drive/build-config');
+  const { EMBER_ENV } = process.env;
+  var config = require('./config/environment')(EMBER_ENV);
 
   const app = new EmberApp(defaults, {
     hinting: false,
@@ -28,6 +30,11 @@ module.exports = async function (defaults) {
     svg: {
       paths: ['../../addons/core/public'],
     },
+    '@embroider/macros': {
+      setOwnConfig: {
+        startMirageWithApp: config.mirage?.enabled ?? false,
+      },
+    },
   });
 
   // TODO: The deprecations object removed in ember-data 6.0.
diff --git a/ui/desktop/tests/helpers/index.js b/ui/desktop/tests/helpers/index.js
index fd622411e9..b9726cb81f 100644
--- a/ui/desktop/tests/helpers/index.js
+++ b/ui/desktop/tests/helpers/index.js
@@ -9,7 +9,7 @@ import {
   setupTest as upstreamSetupTest,
 } from 'ember-qunit';
 import { authenticateSession } from 'ember-simple-auth/test-support';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 
 // This file exists to provide wrappers around ember-qunit's
 // test setup functions. This way, you can easily extend the setup that is
diff --git a/ui/desktop/tests/integration/components/hidden-secret-test.js b/ui/desktop/tests/integration/components/hidden-secret-test.js
index afbc8c044e..e0f5cf6f14 100644
--- a/ui/desktop/tests/integration/components/hidden-secret-test.js
+++ b/ui/desktop/tests/integration/components/hidden-secret-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, click } from '@ember/test-helpers';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupIntl } from 'ember-intl/test-support';
 module('Integration | Component | hidden-secret', function (hooks) {
diff --git a/ui/desktop/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js b/ui/desktop/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js
index 4acf3a9e65..fd0822ba96 100644
--- a/ui/desktop/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js
+++ b/ui/desktop/tests/unit/controllers/scopes/scope/authenticate/method/index-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import { visit, currentURL, settled } from '@ember/test-helpers';
 import { setupIntl } from 'ember-intl/test-support';
 import WindowMockIPC from '../../../../../../helpers/window-mock-ipc';
diff --git a/ui/desktop/tests/unit/controllers/scopes/scope/projects/sessions/index-test.js b/ui/desktop/tests/unit/controllers/scopes/scope/projects/sessions/index-test.js
index 39e3e55a4c..839886658c 100644
--- a/ui/desktop/tests/unit/controllers/scopes/scope/projects/sessions/index-test.js
+++ b/ui/desktop/tests/unit/controllers/scopes/scope/projects/sessions/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupIntl } from 'ember-intl/test-support';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import setupStubs from 'api/test-support/handlers/cache-daemon-search';
 import { visit } from '@ember/test-helpers';
 import { authenticateSession } from 'ember-simple-auth/test-support';
diff --git a/ui/desktop/tests/unit/controllers/scopes/scope/projects/targets/index-test.js b/ui/desktop/tests/unit/controllers/scopes/scope/projects/targets/index-test.js
index 4261f64245..bfa769b830 100644
--- a/ui/desktop/tests/unit/controllers/scopes/scope/projects/targets/index-test.js
+++ b/ui/desktop/tests/unit/controllers/scopes/scope/projects/targets/index-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
 import { setupIntl } from 'ember-intl/test-support';
-import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
+import { setupMirage } from 'api/test-support/helpers/mirage';
 import setupStubs from 'api/test-support/handlers/cache-daemon-search';
 import { waitUntil, visit } from '@ember/test-helpers';
 import { authenticateSession } from 'ember-simple-auth/test-support';