diff --git a/addons/api/addon/abilities/channel-recording.js b/addons/api/addon/abilities/channel-recording.js
index 8575e84c3..cc75dcfdb 100644
--- a/addons/api/addon/abilities/channel-recording.js
+++ b/addons/api/addon/abilities/channel-recording.js
@@ -4,7 +4,7 @@
  */
 
 import ModelAbility from './model';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * Provides abilities for channel recordings.
diff --git a/addons/api/addon/abilities/credential-store.js b/addons/api/addon/abilities/credential-store.js
index fdc2cc6fc..dea087d51 100644
--- a/addons/api/addon/abilities/credential-store.js
+++ b/addons/api/addon/abilities/credential-store.js
@@ -4,7 +4,7 @@
  */
 
 import ModelAbility from './model';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 /**
  * Provides abilities for credential store.
  */
diff --git a/addons/api/addon/abilities/role.js b/addons/api/addon/abilities/role.js
index 323106252..4ab6abb00 100644
--- a/addons/api/addon/abilities/role.js
+++ b/addons/api/addon/abilities/role.js
@@ -4,7 +4,7 @@
  */
 
 import ModelAbility from './model';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 class InvalidRolePrincipalTypeError extends Error {
   name = 'InvalidRolePrincipalTypeError';
diff --git a/addons/api/addon/handlers/cache-daemon-handler.js b/addons/api/addon/handlers/cache-daemon-handler.js
index 6761d23ce..93a3d46e0 100644
--- a/addons/api/addon/handlers/cache-daemon-handler.js
+++ b/addons/api/addon/handlers/cache-daemon-handler.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner, setOwner } from '@ember/application';
 import { generateMQLExpression } from '../utils/mql-query';
 import { paginateResults } from '../utils/paginate-results';
diff --git a/addons/api/addon/handlers/indexed-db-handler.js b/addons/api/addon/handlers/indexed-db-handler.js
index 69c7b60c1..fe29810a1 100644
--- a/addons/api/addon/handlers/indexed-db-handler.js
+++ b/addons/api/addon/handlers/indexed-db-handler.js
@@ -4,7 +4,7 @@
  */
 
 import { modelIndexes } from 'api/services/indexed-db';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner, setOwner } from '@ember/application';
 import { queryIndexedDb } from '../utils/indexed-db-query';
 import { paginateResults } from '../utils/paginate-results';
diff --git a/addons/api/addon/models/base.js b/addons/api/addon/models/base.js
index c735f45c5..7e01e124c 100644
--- a/addons/api/addon/models/base.js
+++ b/addons/api/addon/models/base.js
@@ -6,7 +6,7 @@
 import Model from '@ember-data/model';
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * Base model class provides common functionality for all models.
diff --git a/addons/api/addon/models/group.js b/addons/api/addon/models/group.js
index b5b7c59c2..816a8eeb8 100644
--- a/addons/api/addon/models/group.js
+++ b/addons/api/addon/models/group.js
@@ -7,7 +7,7 @@ import GeneratedGroupModel from '../generated/models/group';
 import { attr } from '@ember-data/model';
 import { computed } from '@ember/object';
 import { A } from '@ember/array';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class GroupModel extends GeneratedGroupModel {
   // =services
diff --git a/addons/api/addon/models/role.js b/addons/api/addon/models/role.js
index 82c9828f4..d378bcf03 100644
--- a/addons/api/addon/models/role.js
+++ b/addons/api/addon/models/role.js
@@ -5,7 +5,7 @@
 
 import GeneratedRoleModel from '../generated/models/role';
 import { attr } from '@ember-data/model';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export const GRANT_SCOPE_THIS = 'this';
 export const GRANT_SCOPE_CHILDREN = 'children';
diff --git a/addons/api/addon/models/session-recording.js b/addons/api/addon/models/session-recording.js
index aa930bdd0..6425f328a 100644
--- a/addons/api/addon/models/session-recording.js
+++ b/addons/api/addon/models/session-recording.js
@@ -5,7 +5,7 @@
 
 import GeneratedSessionRecordingModel from '../generated/models/session-recording';
 import { hasMany } from '@ember-data/model';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export const TYPE_SESSION_RECORDING_SSH = 'ssh';
 export const TYPES_SESSION_RECORDING = Object.freeze([
diff --git a/addons/api/addon/models/session.js b/addons/api/addon/models/session.js
index 7ec0b10b1..2df997eb1 100644
--- a/addons/api/addon/models/session.js
+++ b/addons/api/addon/models/session.js
@@ -7,7 +7,7 @@ import GeneratedSessionModel from '../generated/models/session';
 import { equal } from '@ember/object/computed';
 import { tracked } from '@glimmer/tracking';
 import { A } from '@ember/array';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { flattenObject } from '../utils/flatten-nested-object';
 import { TYPES_CREDENTIAL_LIBRARY } from 'api/models/credential-library';
 import { TYPE_CREDENTIAL_JSON } from 'api/models/credential';
diff --git a/addons/api/addon/models/target.js b/addons/api/addon/models/target.js
index 97f65f936..7b6472e72 100644
--- a/addons/api/addon/models/target.js
+++ b/addons/api/addon/models/target.js
@@ -5,7 +5,7 @@
 
 import GeneratedTargetModel from '../generated/models/target';
 import { attr } from '@ember-data/model';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export const TYPE_TARGET_TCP = 'tcp';
 export const TYPE_TARGET_SSH = 'ssh';
diff --git a/addons/api/addon/services/resource-filter-store.js b/addons/api/addon/services/resource-filter-store.js
index d6eb12364..7d6efdce2 100644
--- a/addons/api/addon/services/resource-filter-store.js
+++ b/addons/api/addon/services/resource-filter-store.js
@@ -4,7 +4,7 @@
  */
 
 import Service from '@ember/service';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * Takes a POJO representing a query and converts it to a boolean expression
diff --git a/addons/api/addon/services/storage.js b/addons/api/addon/services/storage.js
index bf84fb0ca..a5222b092 100644
--- a/addons/api/addon/services/storage.js
+++ b/addons/api/addon/services/storage.js
@@ -56,7 +56,7 @@ class MemoryStorage {
  *
  * @example
  *   import Route from '@ember/routing/route';
- *   import { inject as service } from '@ember/service';
+ *   import { service } from '@ember/service';
  *   export default class ApplicationRoute extends Route {
  *     @service storage;
  *     afterModel() {
diff --git a/addons/api/tests/dummy/app/routes/application.js b/addons/api/tests/dummy/app/routes/application.js
index c0bc8352a..7b6ed4677 100644
--- a/addons/api/tests/dummy/app/routes/application.js
+++ b/addons/api/tests/dummy/app/routes/application.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ApplicationRoute extends Route {
   // =services
diff --git a/addons/auth/addon/authenticators/oidc.js b/addons/auth/addon/authenticators/oidc.js
index 6b38c6c05..979bd1f2a 100644
--- a/addons/auth/addon/authenticators/oidc.js
+++ b/addons/auth/addon/authenticators/oidc.js
@@ -4,7 +4,7 @@
  */
 
 import BaseAuthenticator from './base';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { reject } from 'rsvp';
 import { waitForPromise } from '@ember/test-waiters';
 
diff --git a/addons/auth/addon/session-stores/cookie.js b/addons/auth/addon/session-stores/cookie.js
index 8d2ab1915..8df47572c 100644
--- a/addons/auth/addon/session-stores/cookie.js
+++ b/addons/auth/addon/session-stores/cookie.js
@@ -6,7 +6,7 @@
 import BaseSessionStore from 'ember-simple-auth/session-stores/base';
 import { resolve, reject } from 'rsvp';
 import { get } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  *
diff --git a/addons/core/README.md b/addons/core/README.md
index c1b129418..4693cef1c 100644
--- a/addons/core/README.md
+++ b/addons/core/README.md
@@ -121,7 +121,7 @@ This addon exposes a service to hold all active scopes (org and project where av
 To make use of the service, import it and initialize it using service injection.
 
 ```js
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ExampleRoute extends Route {
   @service scope;
diff --git a/addons/core/addon/authenticators/oidc.js b/addons/core/addon/authenticators/oidc.js
index 3748d9e60..900855275 100644
--- a/addons/core/addon/authenticators/oidc.js
+++ b/addons/core/addon/authenticators/oidc.js
@@ -4,7 +4,7 @@
  */
 
 import BaseOIDCAuthenticator from 'auth/authenticators/oidc';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * An OIDC authenticator that handles flow kick-off and polling.
diff --git a/addons/core/addon/authenticators/password.js b/addons/core/addon/authenticators/password.js
index 356cc7c39..e3f2bcfed 100644
--- a/addons/core/addon/authenticators/password.js
+++ b/addons/core/addon/authenticators/password.js
@@ -4,7 +4,7 @@
  */
 
 import BasePasswordAuthenticator from 'auth/authenticators/password';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * A username/password authenticator that authenticates with
diff --git a/addons/core/addon/components/filter-tags/index.js b/addons/core/addon/components/filter-tags/index.js
index 82a16cc1d..2882b1e74 100644
--- a/addons/core/addon/components/filter-tags/index.js
+++ b/addons/core/addon/components/filter-tags/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { assert } from '@ember/debug';
 
diff --git a/addons/core/addon/components/pending-confirmations/index.js b/addons/core/addon/components/pending-confirmations/index.js
index 8af4818c5..364201167 100644
--- a/addons/core/addon/components/pending-confirmations/index.js
+++ b/addons/core/addon/components/pending-confirmations/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 /**
diff --git a/addons/core/addon/helpers/format-day-year.js b/addons/core/addon/helpers/format-day-year.js
index 29018c9c2..9379a3a0e 100644
--- a/addons/core/addon/helpers/format-day-year.js
+++ b/addons/core/addon/helpers/format-day-year.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * Takes a `Day` instance and returns in year format if there are no remainders,
diff --git a/addons/core/addon/helpers/format-time-duration.js b/addons/core/addon/helpers/format-time-duration.js
index 6188f2824..3ecf8a32a 100644
--- a/addons/core/addon/helpers/format-time-duration.js
+++ b/addons/core/addon/helpers/format-time-duration.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { DurationFormat } from '@formatjs/intl-durationformat';
 import { secondsToDuration } from 'core/utils/seconds-to-duration';
 
diff --git a/addons/core/addon/helpers/has-resource-filter-selections.js b/addons/core/addon/helpers/has-resource-filter-selections.js
index 8ff267a6e..0cf64a704 100644
--- a/addons/core/addon/helpers/has-resource-filter-selections.js
+++ b/addons/core/addon/helpers/has-resource-filter-selections.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 
diff --git a/addons/core/addon/helpers/is-loading.js b/addons/core/addon/helpers/is-loading.js
index e0f29262b..22dc619d4 100644
--- a/addons/core/addon/helpers/is-loading.js
+++ b/addons/core/addon/helpers/is-loading.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * This helper returns true or false based on the state of the ember-loading
diff --git a/addons/core/addon/helpers/relative-datetime-live.js b/addons/core/addon/helpers/relative-datetime-live.js
index ac7a5669f..4362b289f 100644
--- a/addons/core/addon/helpers/relative-datetime-live.js
+++ b/addons/core/addon/helpers/relative-datetime-live.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 const MILLISECOND = 1;
 const SECOND = MILLISECOND * 1000;
diff --git a/addons/core/addon/helpers/resource-filter.js b/addons/core/addon/helpers/resource-filter.js
index f1bb8caf1..c635d0805 100644
--- a/addons/core/addon/helpers/resource-filter.js
+++ b/addons/core/addon/helpers/resource-filter.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 
diff --git a/addons/core/addon/helpers/reverse-indexed-display-name.js b/addons/core/addon/helpers/reverse-indexed-display-name.js
index 94f69ab75..a379de5b8 100644
--- a/addons/core/addon/helpers/reverse-indexed-display-name.js
+++ b/addons/core/addon/helpers/reverse-indexed-display-name.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export function reverseIndexedDisplayName(intl, translation, array, item) {
   const length = array.length;
diff --git a/addons/core/addon/helpers/time-remaining.js b/addons/core/addon/helpers/time-remaining.js
index 72e5b5610..29050ee8c 100644
--- a/addons/core/addon/helpers/time-remaining.js
+++ b/addons/core/addon/helpers/time-remaining.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { DurationFormat } from '@formatjs/intl-durationformat';
 import { secondsToDuration } from 'core/utils/seconds-to-duration';
 
diff --git a/addons/core/addon/helpers/truncate-list.js b/addons/core/addon/helpers/truncate-list.js
index f16326a0d..57fb1dcd1 100644
--- a/addons/core/addon/helpers/truncate-list.js
+++ b/addons/core/addon/helpers/truncate-list.js
@@ -12,7 +12,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class extends Helper {
   // =services
diff --git a/addons/core/tests/dummy/app/controllers/index.js b/addons/core/tests/dummy/app/controllers/index.js
index dac4895a2..9cbc6f246 100644
--- a/addons/core/tests/dummy/app/controllers/index.js
+++ b/addons/core/tests/dummy/app/controllers/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class IndexController extends Controller {
   // =services
diff --git a/addons/core/tests/dummy/app/routes/application.js b/addons/core/tests/dummy/app/routes/application.js
index c36567d25..1ebf40798 100644
--- a/addons/core/tests/dummy/app/routes/application.js
+++ b/addons/core/tests/dummy/app/routes/application.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ApplicationRoute extends Route {
   @service intl;
diff --git a/addons/rose/addon/components/rose/pagination/index.js b/addons/rose/addon/components/rose/pagination/index.js
index 96aa1cd71..fd6e48e0a 100644
--- a/addons/rose/addon/components/rose/pagination/index.js
+++ b/addons/rose/addon/components/rose/pagination/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class RosePaginationComponent extends Component {
diff --git a/ui/admin/app/abilities/auth-method.js b/ui/admin/app/abilities/auth-method.js
index 9d9b5e924..705be56bb 100644
--- a/ui/admin/app/abilities/auth-method.js
+++ b/ui/admin/app/abilities/auth-method.js
@@ -4,7 +4,7 @@
  */
 
 import AuthMethodAbility from 'api/abilities/auth-method';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideAuthMethodAbility extends AuthMethodAbility {
   //service
diff --git a/ui/admin/app/abilities/channel-recording.js b/ui/admin/app/abilities/channel-recording.js
index 755a02e04..8c8d48949 100644
--- a/ui/admin/app/abilities/channel-recording.js
+++ b/ui/admin/app/abilities/channel-recording.js
@@ -4,7 +4,7 @@
  */
 
 import ChannelRecordingAbility from 'api/abilities/channel-recording';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideChannelRecordingAbility extends ChannelRecordingAbility {
   // =service
diff --git a/ui/admin/app/abilities/credential-library.js b/ui/admin/app/abilities/credential-library.js
index 00435a374..248baea59 100644
--- a/ui/admin/app/abilities/credential-library.js
+++ b/ui/admin/app/abilities/credential-library.js
@@ -4,7 +4,7 @@
  */
 
 import CredentialLibraryAbility from 'api/abilities/credential-library';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideCredentialLibraryAbility extends CredentialLibraryAbility {
   // =service
diff --git a/ui/admin/app/abilities/credential.js b/ui/admin/app/abilities/credential.js
index 4d20514df..5485847b1 100644
--- a/ui/admin/app/abilities/credential.js
+++ b/ui/admin/app/abilities/credential.js
@@ -4,7 +4,7 @@
  */
 
 import CredentialAbility from 'api/abilities/credential';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideCredentialAbility extends CredentialAbility {
   // =service
diff --git a/ui/admin/app/abilities/scope.js b/ui/admin/app/abilities/scope.js
index a578377ba..115025282 100644
--- a/ui/admin/app/abilities/scope.js
+++ b/ui/admin/app/abilities/scope.js
@@ -4,7 +4,7 @@
  */
 
 import OverrideModelAbility from './model';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideScopeAbility extends OverrideModelAbility {
   // =services
diff --git a/ui/admin/app/abilities/session-recording.js b/ui/admin/app/abilities/session-recording.js
index 3e2779b88..25c036091 100644
--- a/ui/admin/app/abilities/session-recording.js
+++ b/ui/admin/app/abilities/session-recording.js
@@ -4,7 +4,7 @@
  */
 
 import SessionRecordingAbility from 'api/abilities/session-recording';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideSessionRecordingAbility extends SessionRecordingAbility {
   // =service
diff --git a/ui/admin/app/abilities/storage-bucket.js b/ui/admin/app/abilities/storage-bucket.js
index e7cdf6fff..5b4865e56 100644
--- a/ui/admin/app/abilities/storage-bucket.js
+++ b/ui/admin/app/abilities/storage-bucket.js
@@ -4,7 +4,7 @@
  */
 
 import StorageBucketAbility from 'api/abilities/storage-bucket';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideStorageBucketAbility extends StorageBucketAbility {
   // =service
diff --git a/ui/admin/app/abilities/user.js b/ui/admin/app/abilities/user.js
index 5da9ae10b..91013e6c3 100644
--- a/ui/admin/app/abilities/user.js
+++ b/ui/admin/app/abilities/user.js
@@ -4,7 +4,7 @@
  */
 
 import UserAbility from 'api/abilities/user';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OverrideUserAbility extends UserAbility {
   // =service
diff --git a/ui/admin/app/components/breadcrumbs/container/index.js b/ui/admin/app/components/breadcrumbs/container/index.js
index 26e087253..f763d2717 100644
--- a/ui/admin/app/components/breadcrumbs/container/index.js
+++ b/ui/admin/app/components/breadcrumbs/container/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 /*
diff --git a/ui/admin/app/components/breadcrumbs/item/index.js b/ui/admin/app/components/breadcrumbs/item/index.js
index 3f550e546..e80ef5945 100644
--- a/ui/admin/app/components/breadcrumbs/item/index.js
+++ b/ui/admin/app/components/breadcrumbs/item/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 
diff --git a/ui/admin/app/components/form/credential/index.js b/ui/admin/app/components/form/credential/index.js
index 93f2a2974..d3f21463d 100644
--- a/ui/admin/app/components/form/credential/index.js
+++ b/ui/admin/app/components/form/credential/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TYPES_CREDENTIAL } from 'api/models/credential';
 
 export default class FormCredentialComponent extends Component {
diff --git a/ui/admin/app/components/form/storage-bucket/index.js b/ui/admin/app/components/form/storage-bucket/index.js
index d48329b36..ba174e207 100644
--- a/ui/admin/app/components/form/storage-bucket/index.js
+++ b/ui/admin/app/components/form/storage-bucket/index.js
@@ -5,7 +5,7 @@
 
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { set } from '@ember/object';
 
 import {
diff --git a/ui/admin/app/components/form/target/add-host-sets/index.js b/ui/admin/app/components/form/target/add-host-sets/index.js
index 45b5de519..3e1283c50 100644
--- a/ui/admin/app/components/form/target/add-host-sets/index.js
+++ b/ui/admin/app/components/form/target/add-host-sets/index.js
@@ -6,7 +6,7 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { A } from '@ember/array';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { loading } from 'ember-loading';
 import { notifyError } from 'core/decorators/notify';
 
diff --git a/ui/admin/app/components/form/target/details/index.js b/ui/admin/app/components/form/target/details/index.js
index f80de1392..340f236d9 100644
--- a/ui/admin/app/components/form/target/details/index.js
+++ b/ui/admin/app/components/form/target/details/index.js
@@ -5,7 +5,7 @@
 
 import Component from '@glimmer/component';
 import { TYPES_TARGET } from 'api/models/target';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 // NOTE: this is all a temporary solution till we have a resource type helper.
 const types = [...TYPES_TARGET].reverse();
diff --git a/ui/admin/app/components/form/user/add-accounts/index.js b/ui/admin/app/components/form/user/add-accounts/index.js
index 50663faa0..8ed6da984 100644
--- a/ui/admin/app/components/form/user/add-accounts/index.js
+++ b/ui/admin/app/components/form/user/add-accounts/index.js
@@ -6,7 +6,7 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { A } from '@ember/array';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class FormUserAddAccountsComponent extends Component {
   // =properties
diff --git a/ui/admin/app/components/form/worker/create-tags/index.js b/ui/admin/app/components/form/worker/create-tags/index.js
index 9780e6db6..8d103771c 100644
--- a/ui/admin/app/components/form/worker/create-tags/index.js
+++ b/ui/admin/app/components/form/worker/create-tags/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import Tag from '../tag';
 
diff --git a/ui/admin/app/components/form/worker/create-worker-led/index.js b/ui/admin/app/components/form/worker/create-worker-led/index.js
index 038fb2c96..10c75081e 100644
--- a/ui/admin/app/components/form/worker/create-worker-led/index.js
+++ b/ui/admin/app/components/form/worker/create-worker-led/index.js
@@ -5,7 +5,7 @@
 
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { A } from '@ember/array';
 import Tag from '../tag';
diff --git a/ui/admin/app/components/header-nav/index.js b/ui/admin/app/components/header-nav/index.js
index abb3b7b6c..93e5998c0 100644
--- a/ui/admin/app/components/header-nav/index.js
+++ b/ui/admin/app/components/header-nav/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class HeaderNavComponent extends Component {
   // =services
diff --git a/ui/admin/app/components/session-recording/status/index.js b/ui/admin/app/components/session-recording/status/index.js
index ddd26483a..88320fa95 100644
--- a/ui/admin/app/components/session-recording/status/index.js
+++ b/ui/admin/app/components/session-recording/status/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import {
   STATE_SESSION_RECORDING_STARTED,
   STATE_SESSION_RECORDING_AVAILABLE,
diff --git a/ui/admin/app/controllers/account/change-password.js b/ui/admin/app/controllers/account/change-password.js
index 20c2882ff..e3b68ad59 100644
--- a/ui/admin/app/controllers/account/change-password.js
+++ b/ui/admin/app/controllers/account/change-password.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
 
diff --git a/ui/admin/app/controllers/application.js b/ui/admin/app/controllers/application.js
index d1ae49a91..8ed63bcf7 100644
--- a/ui/admin/app/controllers/application.js
+++ b/ui/admin/app/controllers/application.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 
diff --git a/ui/admin/app/controllers/onboarding/index.js b/ui/admin/app/controllers/onboarding/index.js
index a21b5cb7b..8a063d89b 100644
--- a/ui/admin/app/controllers/onboarding/index.js
+++ b/ui/admin/app/controllers/onboarding/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/onboarding/success.js b/ui/admin/app/controllers/onboarding/success.js
index 41518cb39..49a979cb0 100644
--- a/ui/admin/app/controllers/onboarding/success.js
+++ b/ui/admin/app/controllers/onboarding/success.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class OnboardingSuccessController extends Controller {
diff --git a/ui/admin/app/controllers/scopes/index.js b/ui/admin/app/controllers/scopes/index.js
index 08078348e..13ea3b901 100644
--- a/ui/admin/app/controllers/scopes/index.js
+++ b/ui/admin/app/controllers/scopes/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesIndexController extends Controller {
   // =services
diff --git a/ui/admin/app/controllers/scopes/scope.js b/ui/admin/app/controllers/scopes/scope.js
index 4395d9421..80a51e631 100644
--- a/ui/admin/app/controllers/scopes/scope.js
+++ b/ui/admin/app/controllers/scopes/scope.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeController extends Controller {
   // =services
diff --git a/ui/admin/app/controllers/scopes/scope/add-storage-policy/create.js b/ui/admin/app/controllers/scopes/scope/add-storage-policy/create.js
index bb25edfa0..049dfcfea 100644
--- a/ui/admin/app/controllers/scopes/scope/add-storage-policy/create.js
+++ b/ui/admin/app/controllers/scopes/scope/add-storage-policy/create.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
 import { loading } from 'ember-loading';
diff --git a/ui/admin/app/controllers/scopes/scope/add-storage-policy/index.js b/ui/admin/app/controllers/scopes/scope/add-storage-policy/index.js
index e87a17fa8..69b2ba844 100644
--- a/ui/admin/app/controllers/scopes/scope/add-storage-policy/index.js
+++ b/ui/admin/app/controllers/scopes/scope/add-storage-policy/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/aliases/index.js b/ui/admin/app/controllers/scopes/scope/aliases/index.js
index ef39cf83a..06c1db8b7 100644
--- a/ui/admin/app/controllers/scopes/scope/aliases/index.js
+++ b/ui/admin/app/controllers/scopes/scope/aliases/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { loading } from 'ember-loading';
diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
index 38a7c0892..a6e3244d5 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/account/set-password.js
@@ -5,7 +5,7 @@
 
 import Controller, { inject as controller } from '@ember/controller';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
 
diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/index.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/index.js
index 69f90fd36..fbde5892c 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/index.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/accounts/index.js
@@ -5,7 +5,7 @@
 
 import Controller, { inject as controller } from '@ember/controller';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index.js b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index.js
index 1361bca8b..3087ad48b 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/auth-method/managed-groups/index.js
@@ -5,7 +5,7 @@
 
 import Controller, { inject as controller } from '@ember/controller';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/auth-methods/index.js b/ui/admin/app/controllers/scopes/scope/auth-methods/index.js
index 545cf6a6c..2fba30a7e 100644
--- a/ui/admin/app/controllers/scopes/scope/auth-methods/index.js
+++ b/ui/admin/app/controllers/scopes/scope/auth-methods/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/authenticate/method/index.js b/ui/admin/app/controllers/scopes/scope/authenticate/method/index.js
index 162121c96..5f81a5409 100644
--- a/ui/admin/app/controllers/scopes/scope/authenticate/method/index.js
+++ b/ui/admin/app/controllers/scopes/scope/authenticate/method/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
diff --git a/ui/admin/app/controllers/scopes/scope/authenticate/method/oidc.js b/ui/admin/app/controllers/scopes/scope/authenticate/method/oidc.js
index ad55293da..5ff97b3e1 100644
--- a/ui/admin/app/controllers/scopes/scope/authenticate/method/oidc.js
+++ b/ui/admin/app/controllers/scopes/scope/authenticate/method/oidc.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class ScopesScopeAuthenticateMethodOidcController extends Controller {
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index.js
index 6a1bad0b2..b63da395e 100644
--- a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index.js
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index.js
@@ -8,7 +8,7 @@ import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesIndexController extends Controller {
   @controller('scopes/scope/credential-stores/index') credentialStores;
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/index.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/index.js
index 49952fbce..5bfb1e5d0 100644
--- a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/index.js
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/index.js
@@ -8,7 +8,7 @@ import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialsIndexController extends Controller {
   @controller('scopes/scope/credential-stores/index') credentialStores;
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/index.js b/ui/admin/app/controllers/scopes/scope/credential-stores/index.js
index 0989443bc..19039610d 100644
--- a/ui/admin/app/controllers/scopes/scope/credential-stores/index.js
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 import { loading } from 'ember-loading';
diff --git a/ui/admin/app/controllers/scopes/scope/groups/group/add-members.js b/ui/admin/app/controllers/scopes/scope/groups/group/add-members.js
index 4e1621695..f1e3519c4 100644
--- a/ui/admin/app/controllers/scopes/scope/groups/group/add-members.js
+++ b/ui/admin/app/controllers/scopes/scope/groups/group/add-members.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/groups/index.js b/ui/admin/app/controllers/scopes/scope/groups/index.js
index a428848e0..348e1d61d 100644
--- a/ui/admin/app/controllers/scopes/scope/groups/index.js
+++ b/ui/admin/app/controllers/scopes/scope/groups/index.js
@@ -5,7 +5,7 @@
 
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
index 8f87ec4bd..035489a8f 100644
--- a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js
index 1e1eb2c53..4355b1f92 100644
--- a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index.js
index 91fff6fe4..12a433e2d 100644
--- a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index.js
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/host-sets/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index.js
index e32f7e7ea..9ad6dadb8 100644
--- a/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index.js
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/host-catalog/hosts/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/host-catalogs/index.js b/ui/admin/app/controllers/scopes/scope/host-catalogs/index.js
index d14174c28..1ea5c138e 100644
--- a/ui/admin/app/controllers/scopes/scope/host-catalogs/index.js
+++ b/ui/admin/app/controllers/scopes/scope/host-catalogs/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { debounce } from 'core/decorators/debounce';
diff --git a/ui/admin/app/controllers/scopes/scope/index.js b/ui/admin/app/controllers/scopes/scope/index.js
index 06151bf10..a363ad746 100644
--- a/ui/admin/app/controllers/scopes/scope/index.js
+++ b/ui/admin/app/controllers/scopes/scope/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/policies/index.js b/ui/admin/app/controllers/scopes/scope/policies/index.js
index e6d8a69fc..bfac3659f 100644
--- a/ui/admin/app/controllers/scopes/scope/policies/index.js
+++ b/ui/admin/app/controllers/scopes/scope/policies/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/roles/index.js b/ui/admin/app/controllers/scopes/scope/roles/index.js
index d569b670a..883673939 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/index.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/add-principals.js b/ui/admin/app/controllers/scopes/scope/roles/role/add-principals.js
index 83635e5fd..982c506fd 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/add-principals.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/add-principals.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/grants.js b/ui/admin/app/controllers/scopes/scope/roles/role/grants.js
index 84b3703c7..014c81f3a 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/grants.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/grants.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js
index 9b52238ad..c948ab8cb 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
index 598bc2645..9269947ea 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
index 466d3d17e..3d90e447b 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/admin/app/controllers/scopes/scope/roles/role/scopes.js b/ui/admin/app/controllers/scopes/scope/roles/role/scopes.js
index 32c02fcbf..2c1b4d176 100644
--- a/ui/admin/app/controllers/scopes/scope/roles/role/scopes.js
+++ b/ui/admin/app/controllers/scopes/scope/roles/role/scopes.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { debounce } from 'core/decorators/debounce';
diff --git a/ui/admin/app/controllers/scopes/scope/session-recordings/index.js b/ui/admin/app/controllers/scopes/scope/session-recordings/index.js
index 7aa719879..71cecff0b 100644
--- a/ui/admin/app/controllers/scopes/scope/session-recordings/index.js
+++ b/ui/admin/app/controllers/scopes/scope/session-recordings/index.js
@@ -7,7 +7,7 @@ import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { debounce } from 'core/decorators/debounce';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeSessionRecordingsIndexController extends Controller {
   // =services
diff --git a/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index.js b/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index.js
index a0ac7360c..8a8a8083c 100644
--- a/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index.js
+++ b/ui/admin/app/controllers/scopes/scope/session-recordings/session-recording/channels-by-connection/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/sessions/index.js b/ui/admin/app/controllers/scopes/scope/sessions/index.js
index fe8a77427..d2749d3c5 100644
--- a/ui/admin/app/controllers/scopes/scope/sessions/index.js
+++ b/ui/admin/app/controllers/scopes/scope/sessions/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import {
   STATUS_SESSION_ACTIVE,
diff --git a/ui/admin/app/controllers/scopes/scope/storage-buckets/index.js b/ui/admin/app/controllers/scopes/scope/storage-buckets/index.js
index 7c66efcb2..c917c25b8 100644
--- a/ui/admin/app/controllers/scopes/scope/storage-buckets/index.js
+++ b/ui/admin/app/controllers/scopes/scope/storage-buckets/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { confirm } from 'core/decorators/confirm';
diff --git a/ui/admin/app/controllers/scopes/scope/storage-buckets/new.js b/ui/admin/app/controllers/scopes/scope/storage-buckets/new.js
index b4ce36e64..fec475db9 100644
--- a/ui/admin/app/controllers/scopes/scope/storage-buckets/new.js
+++ b/ui/admin/app/controllers/scopes/scope/storage-buckets/new.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeStorageBucketsNewController extends Controller {
   @controller('scopes/scope/storage-buckets/index')
diff --git a/ui/admin/app/controllers/scopes/scope/targets/index.js b/ui/admin/app/controllers/scopes/scope/targets/index.js
index e8b6a1903..121ab1ab7 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/index.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { debounce } from 'core/decorators/debounce';
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js b/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js
index 3193569e0..cb44d7eed 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/add-brokered-credential-sources.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js b/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js
index 7e186e144..50b6c4ee1 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/add-host-sources.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js b/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js
index 7a431e179..bf5b0fd1c 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/add-injected-application-credential-sources.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js b/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js
index 78bbfd464..2a50817ee 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
 import { loading } from 'ember-loading';
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/index.js b/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/index.js
index 60fa8de8c..f8c71d015 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/index.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/enable-session-recording/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class ScopesScopeTargetsTargetEnableSessionRecordingIndexController extends Controller {
diff --git a/ui/admin/app/controllers/scopes/scope/targets/target/index.js b/ui/admin/app/controllers/scopes/scope/targets/target/index.js
index 96f11e673..a43cc396d 100644
--- a/ui/admin/app/controllers/scopes/scope/targets/target/index.js
+++ b/ui/admin/app/controllers/scopes/scope/targets/target/index.js
@@ -5,7 +5,7 @@
 
 import Controller, { inject as controller } from '@ember/controller';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
 export default class ScopesScopeTargetsTargetIndexController extends Controller {
diff --git a/ui/admin/app/controllers/scopes/scope/users/index.js b/ui/admin/app/controllers/scopes/scope/users/index.js
index 38d5bb829..7950573ab 100644
--- a/ui/admin/app/controllers/scopes/scope/users/index.js
+++ b/ui/admin/app/controllers/scopes/scope/users/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { debounce } from 'core/decorators/debounce';
diff --git a/ui/admin/app/controllers/scopes/scope/users/user/add-accounts.js b/ui/admin/app/controllers/scopes/scope/users/user/add-accounts.js
index 9242794be..e887c8a97 100644
--- a/ui/admin/app/controllers/scopes/scope/users/user/add-accounts.js
+++ b/ui/admin/app/controllers/scopes/scope/users/user/add-accounts.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/workers/index.js b/ui/admin/app/controllers/scopes/scope/workers/index.js
index 6ba090f11..0540082f6 100644
--- a/ui/admin/app/controllers/scopes/scope/workers/index.js
+++ b/ui/admin/app/controllers/scopes/scope/workers/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/admin/app/controllers/scopes/scope/workers/new.js b/ui/admin/app/controllers/scopes/scope/workers/new.js
index c1c0e2788..eab443891 100644
--- a/ui/admin/app/controllers/scopes/scope/workers/new.js
+++ b/ui/admin/app/controllers/scopes/scope/workers/new.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/workers/worker/create-tags.js b/ui/admin/app/controllers/scopes/scope/workers/worker/create-tags.js
index 05e4f1650..12d0fcdfd 100644
--- a/ui/admin/app/controllers/scopes/scope/workers/worker/create-tags.js
+++ b/ui/admin/app/controllers/scopes/scope/workers/worker/create-tags.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifySuccess, notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/controllers/scopes/scope/workers/worker/tags.js b/ui/admin/app/controllers/scopes/scope/workers/worker/tags.js
index 88a556f5a..7c78b661b 100644
--- a/ui/admin/app/controllers/scopes/scope/workers/worker/tags.js
+++ b/ui/admin/app/controllers/scopes/scope/workers/worker/tags.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
diff --git a/ui/admin/app/helpers/can.js b/ui/admin/app/helpers/can.js
index fb33fc431..29f86d876 100644
--- a/ui/admin/app/helpers/can.js
+++ b/ui/admin/app/helpers/can.js
@@ -4,7 +4,7 @@
  */
 
 import CanHelper from 'ember-can/helpers/can';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import config from 'admin/config/environment';
 
 const isDevelopment = config.environment === 'development';
diff --git a/ui/admin/app/routes/account.js b/ui/admin/app/routes/account.js
index b43aa9afc..9d3bc8ed7 100644
--- a/ui/admin/app/routes/account.js
+++ b/ui/admin/app/routes/account.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class AccountRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/account/change-password.js b/ui/admin/app/routes/account/change-password.js
index ca2c2e4ea..c9239e0ff 100644
--- a/ui/admin/app/routes/account/change-password.js
+++ b/ui/admin/app/routes/account/change-password.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * The change password flow is associated only with password-type auth methods.
diff --git a/ui/admin/app/routes/application.js b/ui/admin/app/routes/application.js
index a5933254c..0226b9b13 100644
--- a/ui/admin/app/routes/application.js
+++ b/ui/admin/app/routes/application.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { A } from '@ember/array';
 import { formatDbName } from 'api/services/indexed-db';
diff --git a/ui/admin/app/routes/authentication-error.js b/ui/admin/app/routes/authentication-error.js
index f480262e6..ee66f6c81 100644
--- a/ui/admin/app/routes/authentication-error.js
+++ b/ui/admin/app/routes/authentication-error.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class AuthenticationErrorRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/index.js b/ui/admin/app/routes/index.js
index e9c2b1316..17e611f98 100644
--- a/ui/admin/app/routes/index.js
+++ b/ui/admin/app/routes/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class IndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/onboarding.js b/ui/admin/app/routes/onboarding.js
index c5c0f6b84..bae7993aa 100644
--- a/ui/admin/app/routes/onboarding.js
+++ b/ui/admin/app/routes/onboarding.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TYPE_TARGET_TCP } from 'api/models/target';
 
 export default class OnboardingRoute extends Route {
diff --git a/ui/admin/app/routes/onboarding/success.js b/ui/admin/app/routes/onboarding/success.js
index b0db38bfd..ece46b193 100644
--- a/ui/admin/app/routes/onboarding/success.js
+++ b/ui/admin/app/routes/onboarding/success.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class OnboardingSuccessRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes.js b/ui/admin/app/routes/scopes.js
index 796ea10f7..9ac958a1f 100644
--- a/ui/admin/app/routes/scopes.js
+++ b/ui/admin/app/routes/scopes.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { A } from '@ember/array';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/index.js b/ui/admin/app/routes/scopes/index.js
index dc4a33abc..241b7d1e1 100644
--- a/ui/admin/app/routes/scopes/index.js
+++ b/ui/admin/app/routes/scopes/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { get } from '@ember/object';
 
 export default class ScopesIndexRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope.js b/ui/admin/app/routes/scopes/scope.js
index f7578b373..1b7632cb1 100644
--- a/ui/admin/app/routes/scopes/scope.js
+++ b/ui/admin/app/routes/scopes/scope.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { A } from '@ember/array';
 import { TYPE_SCOPE_GLOBAL, TYPE_SCOPE_ORG } from 'api/models/scope';
 
diff --git a/ui/admin/app/routes/scopes/scope/add-storage-policy/create.js b/ui/admin/app/routes/scopes/scope/add-storage-policy/create.js
index 99e1b42ff..a0f88365a 100644
--- a/ui/admin/app/routes/scopes/scope/add-storage-policy/create.js
+++ b/ui/admin/app/routes/scopes/scope/add-storage-policy/create.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TYPE_POLICY } from 'api/models/policy';
 
 export default class ScopesScopeAddStoragePolicyCreateRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/add-storage-policy/index.js b/ui/admin/app/routes/scopes/scope/add-storage-policy/index.js
index f100d3341..433bfcfc7 100644
--- a/ui/admin/app/routes/scopes/scope/add-storage-policy/index.js
+++ b/ui/admin/app/routes/scopes/scope/add-storage-policy/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAddStoragePolicyIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/aliases.js b/ui/admin/app/routes/scopes/scope/aliases.js
index 9fa8ae295..cf19db6a7 100644
--- a/ui/admin/app/routes/scopes/scope/aliases.js
+++ b/ui/admin/app/routes/scopes/scope/aliases.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAliasesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/aliases/alias.js b/ui/admin/app/routes/scopes/scope/aliases/alias.js
index 1c5a3c6c4..3a20ed9aa 100644
--- a/ui/admin/app/routes/scopes/scope/aliases/alias.js
+++ b/ui/admin/app/routes/scopes/scope/aliases/alias.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAliasesAliasRoute extends Route {
   @service store;
diff --git a/ui/admin/app/routes/scopes/scope/aliases/index.js b/ui/admin/app/routes/scopes/scope/aliases/index.js
index d6249241e..2c80624a0 100644
--- a/ui/admin/app/routes/scopes/scope/aliases/index.js
+++ b/ui/admin/app/routes/scopes/scope/aliases/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { hash } from 'rsvp';
 
 export default class ScopesScopeAliasesIndexRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/aliases/new.js b/ui/admin/app/routes/scopes/scope/aliases/new.js
index ab9df291f..af8925b4d 100644
--- a/ui/admin/app/routes/scopes/scope/aliases/new.js
+++ b/ui/admin/app/routes/scopes/scope/aliases/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TYPE_ALIAS_TARGET } from 'api/models/alias';
 
 export default class ScopesScopeAliasesNewRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods.js b/ui/admin/app/routes/scopes/scope/auth-methods.js
index 146615d6d..690291a06 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js
index e786f354d..68d3eb634 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { paramValueFinder } from 'admin/utils/param-value-finder';
 
 export default class ScopesScopeAuthMethodsAuthMethodRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
index bd6d74569..70f4b8916 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsAuthMethodAccountsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
index 5f7cc22a4..da60edc07 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/account.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsAuthMethodAccountsAccountRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
index e0ae4a90a..df0ddadad 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/accounts/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsAuthMethodAccountsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
index a7014902f..34999d342 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
index 403eda53f..ad673e6ff 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
index 9c67e31d3..7503cc9c2 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/managed-group/members.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsManagedGroupMembersRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js
index 1de54614f..2d810f378 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/auth-method/managed-groups/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsAuthMethodManagedGroupsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/index.js b/ui/admin/app/routes/scopes/scope/auth-methods/index.js
index 1561492c8..ce894c541 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/index.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/auth-methods/new.js b/ui/admin/app/routes/scopes/scope/auth-methods/new.js
index 7c69f049d..d29b43dda 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods/new.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthMethodsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/authenticate.js b/ui/admin/app/routes/scopes/scope/authenticate.js
index 4fe198ff9..85e486616 100644
--- a/ui/admin/app/routes/scopes/scope/authenticate.js
+++ b/ui/admin/app/routes/scopes/scope/authenticate.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/authenticate/index.js b/ui/admin/app/routes/scopes/scope/authenticate/index.js
index ac499fe60..cf4526ce4 100644
--- a/ui/admin/app/routes/scopes/scope/authenticate/index.js
+++ b/ui/admin/app/routes/scopes/scope/authenticate/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/authenticate/method.js b/ui/admin/app/routes/scopes/scope/authenticate/method.js
index 20070347c..1a35e0491 100644
--- a/ui/admin/app/routes/scopes/scope/authenticate/method.js
+++ b/ui/admin/app/routes/scopes/scope/authenticate/method.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateMethodRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js b/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js
index ff7f9ad6e..b1f9ad5ba 100644
--- a/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js
+++ b/ui/admin/app/routes/scopes/scope/authenticate/method/oidc.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { getOwner } from '@ember/application';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
 import { notifyError } from 'core/decorators/notify';
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js
index 107e91a22..2ef313dd3 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js
index 22159e319..97d06f026 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { paramValueFinder } from 'admin/utils/param-value-finder';
 
 export default class ScopesScopeCredentialStoresCredentialStoreRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js
index ee6b65e70..3aa356fac 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library.js
index d38e152ca..72bd287d8 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesCredentialLibraryRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
index 4276943b4..07202c892 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC } from 'api/models/credential-library';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesNewRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials.js
index e4b4111fa..efbeec581 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/credential.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/credential.js
index e5a0ef986..4afe79588 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/credential.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/credential.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialsCredentialRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/new.js b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/new.js
index 507012be7..21a4a971a 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/new.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/credential-store/credentials/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/index.js b/ui/admin/app/routes/scopes/scope/credential-stores/index.js
index b044ed867..a668e1217 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/index.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/new.js b/ui/admin/app/routes/scopes/scope/credential-stores/new.js
index 59b2de826..7e29c1681 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores/new.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/edit.js b/ui/admin/app/routes/scopes/scope/edit.js
index e0a59d5d9..57b4421df 100644
--- a/ui/admin/app/routes/scopes/scope/edit.js
+++ b/ui/admin/app/routes/scopes/scope/edit.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeEditRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/groups.js b/ui/admin/app/routes/scopes/scope/groups.js
index 3a7ba8c88..a102e4cf1 100644
--- a/ui/admin/app/routes/scopes/scope/groups.js
+++ b/ui/admin/app/routes/scopes/scope/groups.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeGroupsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/groups/group.js b/ui/admin/app/routes/scopes/scope/groups/group.js
index 3f7895f16..bf5ee3706 100644
--- a/ui/admin/app/routes/scopes/scope/groups/group.js
+++ b/ui/admin/app/routes/scopes/scope/groups/group.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeGroupsGroupRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/groups/group/add-members.js b/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
index 517e63e9a..228d3b9d7 100644
--- a/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
+++ b/ui/admin/app/routes/scopes/scope/groups/group/add-members.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { resourceFilter } from 'core/decorators/resource-filter';
 
diff --git a/ui/admin/app/routes/scopes/scope/groups/group/members.js b/ui/admin/app/routes/scopes/scope/groups/group/members.js
index 7e2fdfd43..7b8d78099 100644
--- a/ui/admin/app/routes/scopes/scope/groups/group/members.js
+++ b/ui/admin/app/routes/scopes/scope/groups/group/members.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeGroupsGroupMembersRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/groups/index.js b/ui/admin/app/routes/scopes/scope/groups/index.js
index 4d00963ed..7085d5dda 100644
--- a/ui/admin/app/routes/scopes/scope/groups/index.js
+++ b/ui/admin/app/routes/scopes/scope/groups/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeGroupsIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/groups/new.js b/ui/admin/app/routes/scopes/scope/groups/new.js
index fe10cdfbe..d63584520 100644
--- a/ui/admin/app/routes/scopes/scope/groups/new.js
+++ b/ui/admin/app/routes/scopes/scope/groups/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeGroupsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs.js b/ui/admin/app/routes/scopes/scope/host-catalogs.js
index c0f9a6994..b7ae28cc4 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog.js
index 2f30f7d2d..89d6d2f87 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { paramValueFinder } from 'admin/utils/param-value-finder';
 
 export default class ScopesScopeHostCatalogsHostCatalogRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js
index 006100399..82a2e00a3 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
index 9940890bd..2b432cb4d 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { paramValueFinder } from 'admin/utils/param-value-finder';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
index 43fb24651..b3560d99d 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/add-hosts.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { hash } from 'rsvp';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetAddHostsRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js
index 82da18301..cdc7ecc28 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/create-and-add-host.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetCreateAndAddHostRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.js
index c5d036619..da65f82d0 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { hash, all } from 'rsvp';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js
index 59b2fe894..3f33524ce 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts/host.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetHostsHostRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
index 5e25fda82..e841be008 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js
index 3ba4c7321..87add7343 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/host.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/host.js
index b82dfd585..67b71f521 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/host.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/host.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostsHostRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/new.js
index 86d4fc470..87c0ac7d9 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/index.js
index 26510acfc..f75759684 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/index.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
index e9d4596f9..0c8b21d97 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/index.js b/ui/admin/app/routes/scopes/scope/index.js
index 599a13217..b2ddf3f21 100644
--- a/ui/admin/app/routes/scopes/scope/index.js
+++ b/ui/admin/app/routes/scopes/scope/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/policies.js b/ui/admin/app/routes/scopes/scope/policies.js
index 37b862bf7..58adb8b4d 100644
--- a/ui/admin/app/routes/scopes/scope/policies.js
+++ b/ui/admin/app/routes/scopes/scope/policies.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopePoliciesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/policies/new.js b/ui/admin/app/routes/scopes/scope/policies/new.js
index 772314613..75e3e3f21 100644
--- a/ui/admin/app/routes/scopes/scope/policies/new.js
+++ b/ui/admin/app/routes/scopes/scope/policies/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopePoliciesNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/policies/policy.js b/ui/admin/app/routes/scopes/scope/policies/policy.js
index 4c7de332d..5a18b265a 100644
--- a/ui/admin/app/routes/scopes/scope/policies/policy.js
+++ b/ui/admin/app/routes/scopes/scope/policies/policy.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopePoliciesPolicyRoute extends Route {
   @service store;
diff --git a/ui/admin/app/routes/scopes/scope/roles.js b/ui/admin/app/routes/scopes/scope/roles.js
index 07d190209..6fbbaf852 100644
--- a/ui/admin/app/routes/scopes/scope/roles.js
+++ b/ui/admin/app/routes/scopes/scope/roles.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeRolesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/roles/index.js b/ui/admin/app/routes/scopes/scope/roles/index.js
index 33f9bfff5..44e7ad4a1 100644
--- a/ui/admin/app/routes/scopes/scope/roles/index.js
+++ b/ui/admin/app/routes/scopes/scope/roles/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeRolesIndexRoute extends Route {
   // =attributes
diff --git a/ui/admin/app/routes/scopes/scope/roles/new.js b/ui/admin/app/routes/scopes/scope/roles/new.js
index 2e5984d50..e3ff8f9ed 100644
--- a/ui/admin/app/routes/scopes/scope/roles/new.js
+++ b/ui/admin/app/routes/scopes/scope/roles/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeRolesNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/roles/role.js b/ui/admin/app/routes/scopes/scope/roles/role.js
index c12f8ebb1..bc772c857 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class ScopesScopeRolesRoleRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js b/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
index 670493ee2..5442ea20f 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/add-principals.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { resourceFilter } from 'core/decorators/resource-filter';
 import {
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/index.js b/ui/admin/app/routes/scopes/scope/roles/role/index.js
index df3f4783f..f9bdf69e6 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/index.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeRolesRoleIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js b/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
index e5ed284d9..c4f858236 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-custom-scopes.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TrackedObject } from 'tracked-built-ins';
 import { TYPE_SCOPE_PROJECT } from 'api/models/scope';
 
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-org-projects.js b/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
index 66978e5b8..d36bbaa03 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/manage-scopes/manage-org-projects.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeRolesRoleManageScopesManageOrgProjectsRoute extends Route {
   // =attributes
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/principals.js b/ui/admin/app/routes/scopes/scope/roles/role/principals.js
index 32f7692af..9e5dedb07 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/principals.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/principals.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import {
   TYPE_AUTH_METHOD_OIDC,
   TYPE_AUTH_METHOD_LDAP,
diff --git a/ui/admin/app/routes/scopes/scope/roles/role/scopes.js b/ui/admin/app/routes/scopes/scope/roles/role/scopes.js
index be6b23205..8412748f6 100644
--- a/ui/admin/app/routes/scopes/scope/roles/role/scopes.js
+++ b/ui/admin/app/routes/scopes/scope/roles/role/scopes.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeRolesRoleScopesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/scopes.js b/ui/admin/app/routes/scopes/scope/scopes.js
index ecb8b4aa9..6d410b6b4 100644
--- a/ui/admin/app/routes/scopes/scope/scopes.js
+++ b/ui/admin/app/routes/scopes/scope/scopes.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * The scopes route lists subscopes under the currently active scope.
diff --git a/ui/admin/app/routes/scopes/scope/scopes/index.js b/ui/admin/app/routes/scopes/scope/scopes/index.js
index 5222a0808..3245dfa08 100644
--- a/ui/admin/app/routes/scopes/scope/scopes/index.js
+++ b/ui/admin/app/routes/scopes/scope/scopes/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeScopesIndexRoute extends Route {
   // =attributes
diff --git a/ui/admin/app/routes/scopes/scope/scopes/new.js b/ui/admin/app/routes/scopes/scope/scopes/new.js
index 26d4a5910..03a94b0f4 100644
--- a/ui/admin/app/routes/scopes/scope/scopes/new.js
+++ b/ui/admin/app/routes/scopes/scope/scopes/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeScopesNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings.js b/ui/admin/app/routes/scopes/scope/session-recordings.js
index e516633c8..e51fc78ac 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeSessionRecordingsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/index.js b/ui/admin/app/routes/scopes/scope/session-recordings/index.js
index 3e918da80..81bbeb3c7 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings/index.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class ScopesScopeSessionRecordingsIndexRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording.js b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording.js
index 74677ab29..d6db61042 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { paramValueFinder } from 'admin/utils/param-value-finder';
 
 export default class ScopesScopeSessionRecordingsSessionRecordingRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js
index 094e1b979..c04023cb2 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeSessionRecordingsSessionRecordingChannelsByConnectionRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js
index 497f38a3a..0334df8ea 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeSessionRecordingsSessionRecordingChannelsByConnectionChannelRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/index.js b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/index.js
index a4b45883f..cd2a500d7 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/index.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/channels-by-connection/channel/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeSessionRecordingsSessionRecordingChannelsByConnectionChannelIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/index.js b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/index.js
index e814a0d89..7d942330e 100644
--- a/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/index.js
+++ b/ui/admin/app/routes/scopes/scope/session-recordings/session-recording/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeSessionRecordingsSessionRecordingIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/sessions.js b/ui/admin/app/routes/scopes/scope/sessions.js
index 585921d67..9e80302d9 100644
--- a/ui/admin/app/routes/scopes/scope/sessions.js
+++ b/ui/admin/app/routes/scopes/scope/sessions.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeSessionsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/sessions/index.js b/ui/admin/app/routes/scopes/scope/sessions/index.js
index ff589f2e8..825d449f8 100644
--- a/ui/admin/app/routes/scopes/scope/sessions/index.js
+++ b/ui/admin/app/routes/scopes/scope/sessions/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class ScopesScopeSessionsIndexRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets.js b/ui/admin/app/routes/scopes/scope/storage-buckets.js
index 30fd09253..a0246b369 100644
--- a/ui/admin/app/routes/scopes/scope/storage-buckets.js
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeStorageBucketsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets/new.js b/ui/admin/app/routes/scopes/scope/storage-buckets/new.js
index f369767bc..272fb1fae 100644
--- a/ui/admin/app/routes/scopes/scope/storage-buckets/new.js
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import {
   TYPE_STORAGE_BUCKET_PLUGIN,
   TYPE_STORAGE_BUCKET_PLUGIN_AWS_S3,
diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js b/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js
index c3f1b7016..07735b000 100644
--- a/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeStorageBucketsStorageBucketRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket/index.js b/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket/index.js
index 37c11a497..679a43615 100644
--- a/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket/index.js
+++ b/ui/admin/app/routes/scopes/scope/storage-buckets/storage-bucket/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeStorageBucketsStorageBucketIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets.js b/ui/admin/app/routes/scopes/scope/targets.js
index 791e681ca..4db76f38c 100644
--- a/ui/admin/app/routes/scopes/scope/targets.js
+++ b/ui/admin/app/routes/scopes/scope/targets.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/index.js b/ui/admin/app/routes/scopes/scope/targets/index.js
index 2db2a13b1..d35b80c6e 100644
--- a/ui/admin/app/routes/scopes/scope/targets/index.js
+++ b/ui/admin/app/routes/scopes/scope/targets/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import {
   STATUS_SESSION_ACTIVE,
   STATUS_SESSION_PENDING,
diff --git a/ui/admin/app/routes/scopes/scope/targets/new.js b/ui/admin/app/routes/scopes/scope/targets/new.js
index c25a8bb96..65c29d94f 100644
--- a/ui/admin/app/routes/scopes/scope/targets/new.js
+++ b/ui/admin/app/routes/scopes/scope/targets/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TYPE_TARGET_TCP, TYPE_TARGET_SSH } from 'api/models/target';
 
 export default class ScopesScopeTargetsNewRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/targets/target.js b/ui/admin/app/routes/scopes/scope/targets/target.js
index 71ebe8a0b..f27afac51 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/add-brokered-credential-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/add-brokered-credential-sources.js
index fed6dbb73..2e8f26c1d 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/add-brokered-credential-sources.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/add-brokered-credential-sources.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetAddBrokeredCredentialSourcesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js
index e3010541b..9e77db752 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/add-host-sources.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetAddHostSourcesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/add-injected-application-credential-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/add-injected-application-credential-sources.js
index 940b42f24..996e391d6 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/add-injected-application-credential-sources.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/add-injected-application-credential-sources.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetAddInjectedApplicationCredentialSourcesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/brokered-credential-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/brokered-credential-sources.js
index 7dd442ace..d49bb9c43 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/brokered-credential-sources.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/brokered-credential-sources.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { all } from 'rsvp';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetBrokeredCredentialSourcesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/create-alias.js b/ui/admin/app/routes/scopes/scope/targets/target/create-alias.js
index d712c93ed..9f78445b4 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/create-alias.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/create-alias.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TYPE_ALIAS_TARGET } from 'api/models/alias';
 
 export default class ScopesScopeTargetsTargetCreateAliasRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js b/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js
index d3aead918..ee568fceb 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/create-storage-bucket.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import {
   TYPE_STORAGE_BUCKET_PLUGIN,
   TYPE_STORAGE_BUCKET_PLUGIN_AWS_S3,
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js b/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js
index ffc7659d8..e4238bf82 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/enable-session-recording/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetEnableSessionRecordingIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/host-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/host-sources.js
index 9b88939b2..ef826eb03 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/host-sources.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/host-sources.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { all, hash } from 'rsvp';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetHostSourcesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/index.js b/ui/admin/app/routes/scopes/scope/targets/target/index.js
index 2bd714b06..e1c2c2483 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/index.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetIndexRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/injected-application-credential-sources.js b/ui/admin/app/routes/scopes/scope/targets/target/injected-application-credential-sources.js
index 3c39495c0..47ac19f31 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/injected-application-credential-sources.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/injected-application-credential-sources.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { all } from 'rsvp';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetInjectedApplicationCredentialSourcesRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/targets/target/manage-alias.js b/ui/admin/app/routes/scopes/scope/targets/target/manage-alias.js
index d4e936cfc..3b858d025 100644
--- a/ui/admin/app/routes/scopes/scope/targets/target/manage-alias.js
+++ b/ui/admin/app/routes/scopes/scope/targets/target/manage-alias.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeTargetsTargetManageAliasRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/users.js b/ui/admin/app/routes/scopes/scope/users.js
index fea406f6f..f34c9661f 100644
--- a/ui/admin/app/routes/scopes/scope/users.js
+++ b/ui/admin/app/routes/scopes/scope/users.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeUsersRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/users/index.js b/ui/admin/app/routes/scopes/scope/users/index.js
index 6c54ac6d7..f8797f3d3 100644
--- a/ui/admin/app/routes/scopes/scope/users/index.js
+++ b/ui/admin/app/routes/scopes/scope/users/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeUsersIndexRoute extends Route {
   // =attributes
diff --git a/ui/admin/app/routes/scopes/scope/users/new.js b/ui/admin/app/routes/scopes/scope/users/new.js
index dc609c94c..53dc1a324 100644
--- a/ui/admin/app/routes/scopes/scope/users/new.js
+++ b/ui/admin/app/routes/scopes/scope/users/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeUsersNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/users/user.js b/ui/admin/app/routes/scopes/scope/users/user.js
index a37e07b84..36465052b 100644
--- a/ui/admin/app/routes/scopes/scope/users/user.js
+++ b/ui/admin/app/routes/scopes/scope/users/user.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeUsersUserRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/users/user/accounts.js b/ui/admin/app/routes/scopes/scope/users/user/accounts.js
index 8a66ccad9..9edf80df6 100644
--- a/ui/admin/app/routes/scopes/scope/users/user/accounts.js
+++ b/ui/admin/app/routes/scopes/scope/users/user/accounts.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { hash, all } from 'rsvp';
 
 export default class ScopesScopeUsersUserAccountsRoute extends Route {
diff --git a/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js b/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js
index 25ff45c00..6aecac7a1 100644
--- a/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js
+++ b/ui/admin/app/routes/scopes/scope/users/user/add-accounts.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeUsersUserAddAccountsRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/workers.js b/ui/admin/app/routes/scopes/scope/workers.js
index dd6c25ae5..1a5ac7285 100644
--- a/ui/admin/app/routes/scopes/scope/workers.js
+++ b/ui/admin/app/routes/scopes/scope/workers.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeWorkersRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/workers/new.js b/ui/admin/app/routes/scopes/scope/workers/new.js
index 028fb37b6..611a559f2 100644
--- a/ui/admin/app/routes/scopes/scope/workers/new.js
+++ b/ui/admin/app/routes/scopes/scope/workers/new.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeWorkersNewRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/workers/worker.js b/ui/admin/app/routes/scopes/scope/workers/worker.js
index 018933283..529a4b657 100644
--- a/ui/admin/app/routes/scopes/scope/workers/worker.js
+++ b/ui/admin/app/routes/scopes/scope/workers/worker.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeWorkersWorkerRoute extends Route {
   // =services
diff --git a/ui/admin/app/routes/scopes/scope/workers/worker/create-tags.js b/ui/admin/app/routes/scopes/scope/workers/worker/create-tags.js
index c361396d3..001d33afc 100644
--- a/ui/admin/app/routes/scopes/scope/workers/worker/create-tags.js
+++ b/ui/admin/app/routes/scopes/scope/workers/worker/create-tags.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { TrackedArray } from 'tracked-built-ins';
 
 export default class ScopesScopeWorkersWorkerCreateTagsRoute extends Route {
diff --git a/ui/admin/app/services/feature-edition.js b/ui/admin/app/services/feature-edition.js
index 91ace6460..41426b546 100644
--- a/ui/admin/app/services/feature-edition.js
+++ b/ui/admin/app/services/feature-edition.js
@@ -4,7 +4,7 @@
  */
 
 import Service from '@ember/service';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import config from 'admin/config/environment';
 
diff --git a/ui/admin/app/services/session.js b/ui/admin/app/services/session.js
index b2d5f251b..ff699a4de 100644
--- a/ui/admin/app/services/session.js
+++ b/ui/admin/app/services/session.js
@@ -4,7 +4,7 @@
  */
 
 import BaseSessionService from 'ember-simple-auth/services/session';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { formatDbName } from 'api/services/indexed-db';
 
 export default class SessionService extends BaseSessionService {
diff --git a/ui/admin/app/services/window-manager.js b/ui/admin/app/services/window-manager.js
index f0941f5c7..dc93d1ce0 100644
--- a/ui/admin/app/services/window-manager.js
+++ b/ui/admin/app/services/window-manager.js
@@ -4,7 +4,7 @@
  */
 
 import Service from '@ember/service';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * The window manager service enables browser windows to open and close
diff --git a/ui/desktop/app/components/session/proxy-url/index.js b/ui/desktop/app/components/session/proxy-url/index.js
index 7e2c53630..b2cc084c8 100644
--- a/ui/desktop/app/components/session/proxy-url/index.js
+++ b/ui/desktop/app/components/session/proxy-url/index.js
@@ -6,7 +6,7 @@
 import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class SessionProxyUrlComponent extends Component {
   @service intl;
diff --git a/ui/desktop/app/components/session/tabs/index.js b/ui/desktop/app/components/session/tabs/index.js
index 392bf60d5..589ffe4ac 100644
--- a/ui/desktop/app/components/session/tabs/index.js
+++ b/ui/desktop/app/components/session/tabs/index.js
@@ -5,7 +5,7 @@
 
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { Terminal } from '@xterm/xterm';
 import { FitAddon } from '@xterm/addon-fit';
 import { CanvasAddon } from '@xterm/addon-canvas';
diff --git a/ui/desktop/app/components/settings-card/application/index.js b/ui/desktop/app/components/settings-card/application/index.js
index 6e38af3d5..7ee374952 100644
--- a/ui/desktop/app/components/settings-card/application/index.js
+++ b/ui/desktop/app/components/settings-card/application/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 const THEMES = [
   {
diff --git a/ui/desktop/app/components/settings-card/client-agent/index.js b/ui/desktop/app/components/settings-card/client-agent/index.js
index 5cf787388..9f0d41719 100644
--- a/ui/desktop/app/components/settings-card/client-agent/index.js
+++ b/ui/desktop/app/components/settings-card/client-agent/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifyError } from 'core/decorators/notify';
diff --git a/ui/desktop/app/components/settings-card/logs/index.js b/ui/desktop/app/components/settings-card/logs/index.js
index 40a14c4e5..54ce86af3 100644
--- a/ui/desktop/app/components/settings-card/logs/index.js
+++ b/ui/desktop/app/components/settings-card/logs/index.js
@@ -5,7 +5,7 @@
 
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class SettingsCardLogsComponent extends Component {
   // =services
diff --git a/ui/desktop/app/components/settings-card/server/index.js b/ui/desktop/app/components/settings-card/server/index.js
index 07187a372..31b49abb4 100644
--- a/ui/desktop/app/components/settings-card/server/index.js
+++ b/ui/desktop/app/components/settings-card/server/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class SettingsCardServerComponent extends Component {
   // =services
diff --git a/ui/desktop/app/components/settings-card/user/index.js b/ui/desktop/app/components/settings-card/user/index.js
index 0c946ae30..c341dc245 100644
--- a/ui/desktop/app/components/settings-card/user/index.js
+++ b/ui/desktop/app/components/settings-card/user/index.js
@@ -4,7 +4,7 @@
  */
 
 import Component from '@glimmer/component';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class SettingsUserInfoComponent extends Component {
diff --git a/ui/desktop/app/controllers/application.js b/ui/desktop/app/controllers/application.js
index 4cd4a5637..34042ec39 100644
--- a/ui/desktop/app/controllers/application.js
+++ b/ui/desktop/app/controllers/application.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 export default class ApplicationController extends Controller {
diff --git a/ui/desktop/app/controllers/cluster-url.js b/ui/desktop/app/controllers/cluster-url.js
index 78ae52e96..15fb8a78e 100644
--- a/ui/desktop/app/controllers/cluster-url.js
+++ b/ui/desktop/app/controllers/cluster-url.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { notifyError } from 'core/decorators/notify';
diff --git a/ui/desktop/app/controllers/scopes/scope.js b/ui/desktop/app/controllers/scopes/scope.js
index 4395d9421..80a51e631 100644
--- a/ui/desktop/app/controllers/scopes/scope.js
+++ b/ui/desktop/app/controllers/scopes/scope.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeController extends Controller {
   // =services
diff --git a/ui/desktop/app/controllers/scopes/scope/authenticate.js b/ui/desktop/app/controllers/scopes/scope/authenticate.js
index 63ea776ab..307e5831b 100644
--- a/ui/desktop/app/controllers/scopes/scope/authenticate.js
+++ b/ui/desktop/app/controllers/scopes/scope/authenticate.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateController extends Controller {
   // =services
diff --git a/ui/desktop/app/controllers/scopes/scope/authenticate/method/index.js b/ui/desktop/app/controllers/scopes/scope/authenticate/method/index.js
index de28152b3..7b96049e9 100644
--- a/ui/desktop/app/controllers/scopes/scope/authenticate/method/index.js
+++ b/ui/desktop/app/controllers/scopes/scope/authenticate/method/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { getOwner } from '@ember/application';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
diff --git a/ui/desktop/app/controllers/scopes/scope/authenticate/method/oidc.js b/ui/desktop/app/controllers/scopes/scope/authenticate/method/oidc.js
index 31bbec879..597680cf3 100644
--- a/ui/desktop/app/controllers/scopes/scope/authenticate/method/oidc.js
+++ b/ui/desktop/app/controllers/scopes/scope/authenticate/method/oidc.js
@@ -5,7 +5,7 @@
 
 import Controller, { inject as controller } from '@ember/controller';
 import { action } from '@ember/object';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateMethodOidcController extends Controller {
   @controller('scopes/scope/authenticate/method/index') authenticateMethod;
diff --git a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js b/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js
index bc879530d..ca16bdf8e 100644
--- a/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js
+++ b/ui/desktop/app/controllers/scopes/scope/projects/sessions/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
diff --git a/ui/desktop/app/controllers/scopes/scope/projects/targets/index.js b/ui/desktop/app/controllers/scopes/scope/projects/targets/index.js
index 315289e3e..70ccda175 100644
--- a/ui/desktop/app/controllers/scopes/scope/projects/targets/index.js
+++ b/ui/desktop/app/controllers/scopes/scope/projects/targets/index.js
@@ -4,7 +4,7 @@
  */
 
 import Controller from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { loading } from 'ember-loading';
 import { tracked } from '@glimmer/tracking';
diff --git a/ui/desktop/app/controllers/scopes/scope/projects/targets/target.js b/ui/desktop/app/controllers/scopes/scope/projects/targets/target.js
index f9e9bbbbe..2fb9b2e97 100644
--- a/ui/desktop/app/controllers/scopes/scope/projects/targets/target.js
+++ b/ui/desktop/app/controllers/scopes/scope/projects/targets/target.js
@@ -4,7 +4,7 @@
  */
 
 import Controller, { inject as controller } from '@ember/controller';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
 
diff --git a/ui/desktop/app/helpers/is-loading.js b/ui/desktop/app/helpers/is-loading.js
index e0f29262b..22dc619d4 100644
--- a/ui/desktop/app/helpers/is-loading.js
+++ b/ui/desktop/app/helpers/is-loading.js
@@ -4,7 +4,7 @@
  */
 
 import Helper from '@ember/component/helper';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 /**
  * This helper returns true or false based on the state of the ember-loading
diff --git a/ui/desktop/app/routes/application.js b/ui/desktop/app/routes/application.js
index d6b796f0f..11c5f266e 100644
--- a/ui/desktop/app/routes/application.js
+++ b/ui/desktop/app/routes/application.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { A } from '@ember/array';
 import { notifyError } from 'core/decorators/notify';
diff --git a/ui/desktop/app/routes/cluster-url.js b/ui/desktop/app/routes/cluster-url.js
index 3e8985eb5..48bcb3295 100644
--- a/ui/desktop/app/routes/cluster-url.js
+++ b/ui/desktop/app/routes/cluster-url.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import config from '../config/environment';
 
 export default class ClusterUrlRoute extends Route {
diff --git a/ui/desktop/app/routes/index.js b/ui/desktop/app/routes/index.js
index 57c269905..9a2e9f4c6 100644
--- a/ui/desktop/app/routes/index.js
+++ b/ui/desktop/app/routes/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class IndexRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes.js b/ui/desktop/app/routes/scopes.js
index 5be2cc70a..1e51c564d 100644
--- a/ui/desktop/app/routes/scopes.js
+++ b/ui/desktop/app/routes/scopes.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { A } from '@ember/array';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes/index.js b/ui/desktop/app/routes/scopes/index.js
index 0bf9a3471..851b31918 100644
--- a/ui/desktop/app/routes/scopes/index.js
+++ b/ui/desktop/app/routes/scopes/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { get } from '@ember/object';
 
 export default class ScopesIndexRoute extends Route {
diff --git a/ui/desktop/app/routes/scopes/scope.js b/ui/desktop/app/routes/scopes/scope.js
index c9085b843..b1806f329 100644
--- a/ui/desktop/app/routes/scopes/scope.js
+++ b/ui/desktop/app/routes/scopes/scope.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { A } from '@ember/array';
 
 export default class ScopesScopeRoute extends Route {
diff --git a/ui/desktop/app/routes/scopes/scope/authenticate.js b/ui/desktop/app/routes/scopes/scope/authenticate.js
index 347f80dee..94bdd8ed4 100644
--- a/ui/desktop/app/routes/scopes/scope/authenticate.js
+++ b/ui/desktop/app/routes/scopes/scope/authenticate.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes/scope/authenticate/index.js b/ui/desktop/app/routes/scopes/scope/authenticate/index.js
index 1ea56f2a2..58f8ecc24 100644
--- a/ui/desktop/app/routes/scopes/scope/authenticate/index.js
+++ b/ui/desktop/app/routes/scopes/scope/authenticate/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateIndexRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes/scope/authenticate/method.js b/ui/desktop/app/routes/scopes/scope/authenticate/method.js
index 20070347c..1a35e0491 100644
--- a/ui/desktop/app/routes/scopes/scope/authenticate/method.js
+++ b/ui/desktop/app/routes/scopes/scope/authenticate/method.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeAuthenticateMethodRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js b/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js
index d55a08409..5539654cf 100644
--- a/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js
+++ b/ui/desktop/app/routes/scopes/scope/authenticate/method/oidc.js
@@ -5,7 +5,7 @@
 
 import Route from '@ember/routing/route';
 import { getOwner } from '@ember/application';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import { task, timeout } from 'ember-concurrency';
 import { notifyError } from 'core/decorators/notify';
diff --git a/ui/desktop/app/routes/scopes/scope/index.js b/ui/desktop/app/routes/scopes/scope/index.js
index ceb03ecb0..9eef60a1d 100644
--- a/ui/desktop/app/routes/scopes/scope/index.js
+++ b/ui/desktop/app/routes/scopes/scope/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeIndexRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes/scope/projects.js b/ui/desktop/app/routes/scopes/scope/projects.js
index 60805045e..8aeaadc50 100644
--- a/ui/desktop/app/routes/scopes/scope/projects.js
+++ b/ui/desktop/app/routes/scopes/scope/projects.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { restartableTask, timeout } from 'ember-concurrency';
 import config from '../../../config/environment';
 
diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions.js b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
index d6831a6f6..606e7a4ad 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/sessions.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/sessions.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeProjectsSessionsRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions/index.js b/ui/desktop/app/routes/scopes/scope/projects/sessions/index.js
index 0d8f21dd5..55c7b9bb9 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/sessions/index.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/sessions/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 import {
   STATUS_SESSION_ACTIVE,
diff --git a/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js b/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js
index b6a813ca3..e1fdce0cb 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/sessions/session.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 const { __electronLog } = globalThis;
 
diff --git a/ui/desktop/app/routes/scopes/scope/projects/settings/index.js b/ui/desktop/app/routes/scopes/scope/projects/settings/index.js
index 4f4766c6c..072bb582f 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/settings/index.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/settings/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeProjectsSettingsIndexRoute extends Route {
   // =services
diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets/index.js b/ui/desktop/app/routes/scopes/scope/projects/targets/index.js
index 0cb6e0d7a..073a5b86f 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/targets/index.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/targets/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import {
   STATUS_SESSION_ACTIVE,
   STATUS_SESSION_PENDING,
diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets/target.js b/ui/desktop/app/routes/scopes/scope/projects/targets/target.js
index 76d36b392..a5c2ffd87 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/targets/target.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/targets/target.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { action } from '@ember/object';
 
 export default class ScopesScopeProjectsTargetsTargetRoute extends Route {
diff --git a/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js b/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js
index 331916f6e..991deae8d 100644
--- a/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js
+++ b/ui/desktop/app/routes/scopes/scope/projects/targets/target/index.js
@@ -4,7 +4,7 @@
  */
 
 import Route from '@ember/routing/route';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 
 export default class ScopesScopeProjectsTargetsTargetIndexRoute extends Route {
   // =services
diff --git a/ui/desktop/app/services/cluster-url.js b/ui/desktop/app/services/cluster-url.js
index fd7f26f88..26f1a2d5b 100644
--- a/ui/desktop/app/services/cluster-url.js
+++ b/ui/desktop/app/services/cluster-url.js
@@ -5,7 +5,7 @@
 
 import Service from '@ember/service';
 import { assert } from '@ember/debug';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { notifyError } from 'core/decorators/notify';
 
 export default class ClusterUrlService extends Service {
diff --git a/ui/desktop/app/services/ipc.js b/ui/desktop/app/services/ipc.js
index b1b861051..0afaf77fc 100644
--- a/ui/desktop/app/services/ipc.js
+++ b/ui/desktop/app/services/ipc.js
@@ -4,7 +4,7 @@
  */
 
 import Service from '@ember/service';
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import { Promise } from 'rsvp';
 
 /**
diff --git a/ui/desktop/app/services/session.js b/ui/desktop/app/services/session.js
index e4c6b302d..1507ba9f1 100644
--- a/ui/desktop/app/services/session.js
+++ b/ui/desktop/app/services/session.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: BUSL-1.1
  */
 
-import { inject as service } from '@ember/service';
+import { service } from '@ember/service';
 import BaseSessionService from 'ember-simple-auth/services/session';
 import { notifyError } from 'core/decorators/notify';