diff --git a/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs b/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
index e884a60a4..1a1478a45 100644
--- a/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
+++ b/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
@@ -30,7 +30,7 @@
     <dropdown.button
       @style='danger'
       @disabled={{@model.canSave}}
-      {{on 'click' (route-action 'delete' @model)}}
+      {{on 'click' @delete}}
     >
       {{t 'resources.credential-store.actions.delete'}}
     </dropdown.button>
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.js
new file mode 100644
index 000000000..df9875628
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.js
@@ -0,0 +1,8 @@
+import Controller, { inject as controller } from '@ember/controller';
+
+export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesCredentialLibraryIndexController extends Controller {
+  @controller(
+    'scopes/scope/credential-stores/credential-store/credential-libraries/index',
+  )
+  credentialLibraries;
+}
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
new file mode 100644
index 000000000..401b018b9
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index.js
@@ -0,0 +1,99 @@
+import Controller, { inject as controller } from '@ember/controller';
+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';
+
+export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesIndexController extends Controller {
+  @controller('scopes/scope/credential-stores/index') credentialStores;
+
+  // =services
+
+  @service can;
+  @service router;
+
+  // =actions
+
+  /**
+   * Rollback changes on a credential library.
+   * @param {CredentialLibraryModel} credentialLibrary
+   */
+  @action
+  async cancel(credentialLibrary) {
+    const { isNew } = credentialLibrary;
+    credentialLibrary.rollbackAttributes();
+    if (isNew)
+      await this.router.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credential-libraries',
+      );
+  }
+
+  /**
+   * Handle save of a credential library
+   * @param {CredentialLibraryModel} credentialLibrary
+   */
+  @action
+  @loading
+  @notifyError(({ message }) => message)
+  @notifySuccess(({ isNew }) =>
+    isNew ? 'notifications.create-success' : 'notifications.save-success',
+  )
+  async save(credentialLibrary) {
+    await credentialLibrary.save();
+    if (this.can.can('read model', credentialLibrary)) {
+      await this.router.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credential-libraries.credential-library',
+        credentialLibrary,
+      );
+    } else {
+      await this.router.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credential-libraries',
+      );
+    }
+    await this.router.refresh();
+  }
+
+  /**
+   * Handle delete of a credential library
+   * @param {CredentialLibraryModel} credentialLibrary
+   */
+  @action
+  @loading
+  @confirm('questions.delete-confirm')
+  @notifyError(({ message }) => message, { catch: true })
+  @notifySuccess('notifications.delete-success')
+  async delete(credentialLibrary) {
+    await credentialLibrary.destroyRecord();
+    await this.router.replaceWith(
+      'scopes.scope.credential-stores.credential-store.credential-libraries',
+    );
+    await this.router.refresh();
+  }
+
+  /**
+   * Copies the contents of array fields in order to force the instance
+   * into a dirty state.  This ensures that `model.rollbackAttributes()` reverts
+   * to the original expected array.
+   *
+   * The deep copy implemented here is required to ensure that both the
+   * array itself and its members are all new.
+   *
+   * @param {credentialLibraryModel} credentialLibrary
+   */
+  @action
+  edit(credentialLibrary) {
+    const { critical_options, extensions } = credentialLibrary;
+    credentialLibrary.critical_options = structuredClone(critical_options);
+    credentialLibrary.extensions = structuredClone(extensions);
+  }
+
+  /**
+   * Update type of credential library
+   * @param {string} type
+   */
+  @action
+  async changeType(type) {
+    await this.router.replaceWith({ queryParams: { type } });
+  }
+}
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/new.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
index 7d0188606..f55e264e2 100644
--- a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/new.js
@@ -3,10 +3,13 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import Controller from '@ember/controller';
+import Controller, { inject as controller } from '@ember/controller';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesNewController extends Controller {
-  // =services
+  @controller(
+    'scopes/scope/credential-stores/credential-store/credential-libraries/index',
+  )
+  credentialLibraries;
 
   // =attributes
   queryParams = ['type'];
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/credential/index.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/credential/index.js
new file mode 100644
index 000000000..2f6df87d0
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/credential/index.js
@@ -0,0 +1,8 @@
+import Controller, { inject as controller } from '@ember/controller';
+
+export default class ScopesScopeCredentialStoresCredentialStoreCredentialsCredentialIndexController extends Controller {
+  @controller(
+    'scopes/scope/credential-stores/credential-store/credentials/index',
+  )
+  credentials;
+}
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
new file mode 100644
index 000000000..9f61fd1ac
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/index.js
@@ -0,0 +1,81 @@
+import Controller, { inject as controller } from '@ember/controller';
+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';
+
+export default class ScopesScopeCredentialStoresCredentialStoreCredentialsIndexController extends Controller {
+  @controller('scopes/scope/credential-stores/index') credentialStores;
+
+  // =services
+
+  @service can;
+  @service router;
+
+  // =actions
+
+  /**
+   * Rollback changes on a credential.
+   * @param {CredentialModel} credential
+   */
+  @action
+  async cancel(credential) {
+    const { isNew } = credential;
+    credential.rollbackAttributes();
+    if (isNew)
+      await this.router.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credentials',
+      );
+  }
+
+  /**
+   * Handle save of a credential
+   * @param {CredentialModel} credential
+   */
+  @action
+  @loading
+  @notifyError(({ message }) => message)
+  @notifySuccess(({ isNew }) =>
+    isNew ? 'notifications.create-success' : 'notifications.save-success',
+  )
+  async save(credential) {
+    await credential.save();
+    if (this.can.can('read credential', credential)) {
+      await this.router.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credentials.credential',
+        credential,
+      );
+    } else {
+      await this.router.transitionTo(
+        'scopes.scope.credential-stores.credential-store.credentials',
+      );
+    }
+    await this.router.refresh();
+  }
+  /**
+   * Handle delete of a credential
+   * @param {Credential} credential
+   */
+  @action
+  @loading
+  @confirm('questions.delete-confirm')
+  @notifyError(({ message }) => message, { catch: true })
+  @notifySuccess('notifications.delete-success')
+  async delete(credential) {
+    await credential.destroyRecord();
+    await this.router.replaceWith(
+      'scopes.scope.credential-stores.credential-store.credentials',
+    );
+    await this.router.refresh();
+  }
+
+  /**
+   * Update type of credential
+   * @param {string} type
+   */
+  @action
+  async changeType(type) {
+    await this.router.replaceWith({ queryParams: { type } });
+  }
+}
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/new.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/new.js
index 49207e19e..11dd1ee96 100644
--- a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/new.js
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credentials/new.js
@@ -3,10 +3,13 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import Controller from '@ember/controller';
+import Controller, { inject as controller } from '@ember/controller';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialsNewController extends Controller {
-  // =services
+  @controller(
+    'scopes/scope/credential-stores/credential-store/credentials/index',
+  )
+  credentials;
 
   // =attributes
 
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/index.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/index.js
new file mode 100644
index 000000000..6e58ca3fd
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/index.js
@@ -0,0 +1,5 @@
+import Controller, { inject as controller } from '@ember/controller';
+
+export default class ScopesScopeCredentialStoresCredentialStoreIndexController 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
new file mode 100644
index 000000000..3574f24ed
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/index.js
@@ -0,0 +1,73 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+import { action } from '@ember/object';
+import { loading } from 'ember-loading';
+import { confirm } from 'core/decorators/confirm';
+import { notifySuccess, notifyError } from 'core/decorators/notify';
+
+export default class ScopesScopeCredentialStoresIndexController extends Controller {
+  // =services
+
+  @service can;
+  @service router;
+
+  // =actions
+
+  /**
+   * Handle save
+   * @param {CredentialStoreModel} credentialStore
+   */
+  @action
+  @loading
+  @notifyError(({ message }) => message)
+  @notifySuccess('notifications.save-success')
+  async save(credentialStore) {
+    await credentialStore.save();
+    if (this.can.can('read model', credentialStore)) {
+      await this.router.transitionTo(
+        'scopes.scope.credential-stores.credential-store',
+        credentialStore,
+      );
+    } else {
+      await this.router.transitionTo('scopes.scope.credential-stores');
+    }
+    await this.router.refresh();
+  }
+
+  /**
+   * Rollback changes on credential stores.
+   * @param {CredentialStoreModel} credentialStore
+   */
+  @action
+  async cancel(credentialStore) {
+    const { isNew } = credentialStore;
+    credentialStore.rollbackAttributes();
+    if (isNew) {
+      await this.router.transitionTo('scopes.scope.credential-stores');
+    }
+  }
+
+  /**
+   * Deletes the credential store and redirects to index
+   * @param {CredentialStoreModel} credentialStore
+   */
+  @action
+  @loading
+  @confirm('questions.delete-confirm')
+  @notifyError(({ message }) => message, { catch: true })
+  @notifySuccess('notifications.delete-success')
+  async delete(credentialStore) {
+    await credentialStore.destroyRecord();
+    await this.router.replaceWith('scopes.scope.credential-stores');
+    await this.router.refresh();
+  }
+
+  /**
+   * Update type of credential store
+   * @param {string} type
+   */
+  @action
+  async changeType(type) {
+    await this.router.replaceWith({ queryParams: { type } });
+  }
+}
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/new.js b/ui/admin/app/controllers/scopes/scope/credential-stores/new.js
index ee9c6f0ae..f2fabaad7 100644
--- a/ui/admin/app/controllers/scopes/scope/credential-stores/new.js
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/new.js
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import Controller from '@ember/controller';
+import Controller, { inject as controller } from '@ember/controller';
 
 export default class ScopesScopeCredentialStoresNewController extends Controller {
-  // =services
+  @controller('scopes/scope/credential-stores/index') credentialStores;
 
   // =attributes
   queryParams = ['type'];
diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js
index 83f64eba9..f003547df 100644
--- a/ui/admin/app/routes/scopes/scope/credential-stores.js
+++ b/ui/admin/app/routes/scopes/scope/credential-stores.js
@@ -5,17 +5,12 @@
 
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
-import { loading } from 'ember-loading';
-import { confirm } from 'core/decorators/confirm';
-import { notifySuccess, notifyError } from 'core/decorators/notify';
 
 export default class ScopesScopeCredentialStoresRoute extends Route {
   // =services
 
   @service store;
   @service can;
-  @service router;
 
   // =methods
 
@@ -34,49 +29,4 @@ export default class ScopesScopeCredentialStoresRoute extends Route {
       return this.store.query('credential-store', { scope_id });
     }
   }
-
-  // =actions
-
-  /**
-   * Handle save
-   * @param {CredentialStoreModel} credentialStore
-   */
-  @action
-  @loading
-  @notifyError(({ message }) => message)
-  @notifySuccess('notifications.save-success')
-  async save(credentialStore) {
-    await credentialStore.save();
-    await this.router.transitionTo(
-      'scopes.scope.credential-stores.credential-store',
-      credentialStore,
-    );
-    this.refresh();
-  }
-
-  /**
-   * Rollback changes on credential stores.
-   * @param {CredentialStoreModel} credentialStore
-   */
-  @action
-  cancel(credentialStore) {
-    const { isNew } = credentialStore;
-    credentialStore.rollbackAttributes();
-    if (isNew) this.router.transitionTo('scopes.scope.credential-stores');
-  }
-
-  /**
-   * Deletes the credential store and redirects to index
-   * @param {CredentialStoreModel} credentialStore
-   */
-  @action
-  @loading
-  @confirm('questions.delete-confirm')
-  @notifyError(({ message }) => message, { catch: true })
-  @notifySuccess('notifications.delete-success')
-  async delete(credentialStore) {
-    await credentialStore.destroyRecord();
-    await this.router.replaceWith('scopes.scope.credential-stores');
-    this.refresh();
-  }
 }
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 116da8452..3a21f9ed6 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,10 +4,6 @@
  */
 
 import Route from '@ember/routing/route';
-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';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesRoute extends Route {
@@ -15,7 +11,6 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
 
   @service store;
   @service can;
-  @service router;
 
   // =methods
 
@@ -36,62 +31,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
       return this.store.query('credential-library', { credential_store_id });
     }
   }
-
-  // =actions
-
-  /**
-   * Rollback changes on a credential library.
-   * @param {CredentialLibraryModel} credentialLibrary
-   */
-  @action
-  cancel(credentialLibrary) {
-    const { isNew } = credentialLibrary;
-    credentialLibrary.rollbackAttributes();
-    if (isNew)
-      this.router.transitionTo(
-        'scopes.scope.credential-stores.credential-store.credential-libraries',
-      );
-  }
-
-  /**
-   * Handle save of a credential library
-   * @param {CredentialLibraryModel} credentialLibrary
-   */
-  @action
-  @loading
-  @notifyError(({ message }) => message)
-  @notifySuccess(({ isNew }) =>
-    isNew ? 'notifications.create-success' : 'notifications.save-success',
-  )
-  async save(credentialLibrary) {
-    await credentialLibrary.save();
-    if (this.can.can('read model', credentialLibrary)) {
-      await this.router.transitionTo(
-        'scopes.scope.credential-stores.credential-store.credential-libraries.credential-library',
-        credentialLibrary,
-      );
-    } else {
-      await this.router.transitionTo(
-        'scopes.scope.credential-stores.credential-store.credential-libraries',
-      );
-    }
-    this.refresh();
-  }
-
-  /**
-   * Handle delete of a credential library
-   * @param {CredentialLibraryModel} credentialLibrary
-   */
-  @action
-  @loading
-  @confirm('questions.delete-confirm')
-  @notifyError(({ message }) => message, { catch: true })
-  @notifySuccess('notifications.delete-success')
-  async deleteCredentialLibrary(credentialLibrary) {
-    await credentialLibrary.destroyRecord();
-    await this.router.replaceWith(
-      'scopes.scope.credential-stores.credential-store.credential-libraries',
-    );
-    this.refresh();
-  }
 }
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 68b95bdea..ade7ced34 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
@@ -5,13 +5,11 @@
 
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
-import { action } from '@ember/object';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesCredentialLibraryRoute extends Route {
   // =services
 
   @service store;
-  @service can;
   @service router;
 
   // =methods
@@ -45,21 +43,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
       );
     }
   }
-
-  /**
-   * Copies the contents of array fields in order to force the instance
-   * into a dirty state.  This ensures that `model.rollbackAttributes()` reverts
-   * to the original expected array.
-   *
-   * The deep copy implemented here is required to ensure that both the
-   * array itself and its members are all new.
-   *
-   * @param {credentialLibraryModel} credentialLibrary
-   */
-  @action
-  edit(credentialLibrary) {
-    const { critical_options, extensions } = credentialLibrary;
-    credentialLibrary.critical_options = structuredClone(critical_options);
-    credentialLibrary.extensions = structuredClone(extensions);
-  }
 }
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 f2f7f590a..c55295e4b 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,6 @@
  */
 
 import Route from '@ember/routing/route';
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC } from 'api/models/credential-library';
 
@@ -64,13 +63,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
       credential_store_id,
     });
   }
-
-  /**
-   * Update type of credential library
-   * @param {string} type
-   */
-  @action
-  changeType(type) {
-    this.router.replaceWith({ queryParams: { type } });
-  }
 }
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 cf16ec32b..23a51a27a 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,10 +4,6 @@
  */
 
 import Route from '@ember/routing/route';
-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';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialsRoute extends Route {
@@ -15,7 +11,6 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialsRoute
 
   @service store;
   @service can;
-  @service router;
 
   // =methods
 
@@ -36,61 +31,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialsRoute
       return this.store.query('credential', { credential_store_id });
     }
   }
-
-  // =actions
-
-  /**
-   * Rollback changes on a credential.
-   * @param {CredentialModel} credential
-   */
-  @action
-  cancel(credential) {
-    const { isNew } = credential;
-    credential.rollbackAttributes();
-    if (isNew)
-      this.router.transitionTo(
-        'scopes.scope.credential-stores.credential-store.credentials',
-      );
-  }
-
-  /**
-   * Handle save of a credential
-   * @param {CredentialModel} credential
-   */
-  @action
-  @loading
-  @notifyError(({ message }) => message)
-  @notifySuccess(({ isNew }) =>
-    isNew ? 'notifications.create-success' : 'notifications.save-success',
-  )
-  async save(credential) {
-    await credential.save();
-    if (this.can.can('read model', credential)) {
-      await this.router.transitionTo(
-        'scopes.scope.credential-stores.credential-store.credentials.credential',
-        credential,
-      );
-    } else {
-      await this.router.transitionTo(
-        'scopes.scope.credential-stores.credential-store.credentials',
-      );
-    }
-    this.refresh();
-  }
-  /**
-   * Handle delete of a credential
-   * @param {Credential} credential
-   */
-  @action
-  @loading
-  @confirm('questions.delete-confirm')
-  @notifyError(({ message }) => message, { catch: true })
-  @notifySuccess('notifications.delete-success')
-  async deleteCredential(credential) {
-    await credential.destroyRecord();
-    await this.router.replaceWith(
-      'scopes.scope.credential-stores.credential-store.credentials',
-    );
-    this.refresh();
-  }
 }
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 24c0f7b9d..08381b194 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,6 @@
  */
 
 import Route from '@ember/routing/route';
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresCredentialStoreCredentialsNewRoute extends Route {
@@ -77,13 +76,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialsNewRou
       ...typeSpecificAttrs,
     });
   }
-
-  /**
-   * Update type of credential
-   * @param {string} type
-   */
-  @action
-  changeType(type) {
-    this.router.replaceWith({ queryParams: { type } });
-  }
 }
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 77b1fe396..dae260c72 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,6 @@
  */
 
 import Route from '@ember/routing/route';
-import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 
 export default class ScopesScopeCredentialStoresNewRoute extends Route {
@@ -63,13 +62,4 @@ export default class ScopesScopeCredentialStoresNewRoute extends Route {
     record.scopeModel = scopeModel;
     return record;
   }
-
-  /**
-   * Update type of credential store
-   * @param {string} type
-   */
-  @action
-  changeType(type) {
-    this.router.replaceWith({ queryParams: { type } });
-  }
 }
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs
index 3feedaa4f..b8d3686d3 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index.hbs
@@ -38,7 +38,7 @@
         <dropdown.button
           @style='danger'
           @disabled={{@model.canSave}}
-          {{on 'click' (route-action 'deleteCredentialLibrary' @model)}}
+          {{on 'click' (fn this.credentialLibraries.delete @model)}}
         >
           {{t 'resources.credential-library.actions.delete'}}
         </dropdown.button>
@@ -49,9 +49,9 @@
   <page.body>
     <Form::CredentialLibrary
       @model={{@model}}
-      @edit={{route-action 'edit' @model}}
-      @submit={{route-action 'save' @model}}
-      @cancel={{route-action 'cancel' @model}}
+      @edit={{fn this.credentialLibraries.edit @model}}
+      @submit={{fn this.credentialLibraries.save @model}}
+      @cancel={{fn this.credentialLibraries.cancel @model}}
     />
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs
index 7d05f4ed4..8f605cbb3 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/index.hbs
@@ -22,6 +22,7 @@
   <page.actions>
     <CredentialStores::CredentialStore::Actions
       @model={{this.credentialStore}}
+      @delete={{fn this.credentialStores.delete this.credentialStore}}
     />
   </page.actions>
 
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs
index ba8457df6..4ee7808a9 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs
@@ -26,9 +26,9 @@
   <page.body>
     <Form::CredentialLibrary
       @model={{@model}}
-      @submit={{route-action 'save' @model}}
-      @cancel={{route-action 'cancel' @model}}
-      @changeType={{route-action 'changeType'}}
+      @submit={{fn this.credentialLibraries.save @model}}
+      @cancel={{fn this.credentialLibraries.cancel @model}}
+      @changeType={{this.credentialLibraries.changeType}}
     />
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs
index eedd4f12c..9ac13b673 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/credential/index.hbs
@@ -38,7 +38,7 @@
         <dropdown.button
           @style='danger'
           @disabled={{@model.canSave}}
-          {{on 'click' (route-action 'deleteCredential' @model)}}
+          {{on 'click' (fn this.credentials.delete @model)}}
         >
           {{t 'resources.credential.actions.delete'}}
         </dropdown.button>
@@ -49,8 +49,8 @@
   <page.body>
     <Form::Credential
       @model={{@model}}
-      @submit={{route-action 'save' @model}}
-      @cancel={{route-action 'cancel' @model}}
+      @submit={{fn this.credentials.save @model}}
+      @cancel={{fn this.credentials.cancel @model}}
     />
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/index.hbs
index 89c1d3441..79bb45273 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/index.hbs
@@ -22,6 +22,7 @@
   <page.actions>
     <CredentialStores::CredentialStore::Actions
       @model={{this.credentialStore}}
+      @delete={{fn this.credentialStores.delete this.credentialStore}}
     />
   </page.actions>
 
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs
index e4cf8e0a3..7ded5de20 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credentials/new.hbs
@@ -26,9 +26,9 @@
   <page.body>
     <Form::Credential
       @model={{@model}}
-      @submit={{route-action 'save' @model}}
-      @cancel={{route-action 'cancel' @model}}
-      @changeType={{route-action 'changeType'}}
+      @submit={{fn this.credentials.save @model}}
+      @cancel={{fn this.credentials.cancel @model}}
+      @changeType={{this.credentials.changeType}}
     />
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs
index 90943fd40..fc473d13c 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/index.hbs
@@ -18,14 +18,17 @@
   </page.navigation>
 
   <page.actions>
-    <CredentialStores::CredentialStore::Actions @model={{@model}} />
+    <CredentialStores::CredentialStore::Actions
+      @model={{@model}}
+      @delete={{fn this.credentialStores.delete @model}}
+    />
   </page.actions>
 
   <page.body>
     <Form::CredentialStore
       @model={{@model}}
-      @submit={{route-action 'save' @model}}
-      @cancel={{route-action 'cancel' @model}}
+      @submit={{fn this.credentialStores.save @model}}
+      @cancel={{fn this.credentialStores.cancel @model}}
     />
   </page.body>
 </Rose::Layout::Page>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
index 5f2f1dc30..bb6d3672b 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/new.hbs
@@ -25,9 +25,9 @@
   <page.body>
     <Form::CredentialStore
       @model={{@model}}
-      @submit={{route-action 'save' @model}}
-      @cancel={{route-action 'cancel' @model}}
-      @changeType={{route-action 'changeType'}}
+      @submit={{fn this.credentialStores.save @model}}
+      @cancel={{fn this.credentialStores.cancel @model}}
+      @changeType={{this.credentialStores.changeType}}
     />
   </page.body>
 
diff --git a/ui/admin/tests/acceptance/credential-store/credentials/update-test.js b/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
index d4869e4e3..9cdf62147 100644
--- a/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
+++ b/ui/admin/tests/acceptance/credential-store/credentials/update-test.js
@@ -23,6 +23,8 @@ module(
     setupApplicationTest(hooks);
     setupMirage(hooks);
 
+    let featuresService;
+
     const instances = {
       scopes: {
         global: null,
@@ -83,6 +85,8 @@ module(
       urls.usernamePasswordCredential = `${urls.credentials}/${instances.usernamePasswordCredential.id}`;
       urls.usernameKeyPairCredential = `${urls.credentials}/${instances.usernameKeyPairCredential.id}`;
       urls.jsonCredential = `${urls.credentials}/${instances.jsonCredential.id}`;
+
+      featuresService = this.owner.lookup('service:features');
       authenticateSession({});
     });
 
@@ -117,6 +121,7 @@ module(
     });
 
     test('can save changes to existing JSON credential', async function (assert) {
+      featuresService.enable('json-credentials');
       const mockInput = 'random string';
       assert.notEqual(instances.jsonCredential.name, mockInput);
       await visit(urls.jsonCredential);
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index-test.js
new file mode 100644
index 000000000..2e03d20af
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/index',
+      );
+      assert.ok(controller);
+    });
+  },
+);
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js
new file mode 100644
index 000000000..c89ddaf4c
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/credential-stores/credential-store/credential-libraries/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/credential-stores/credential-store/credential-libraries/index',
+      );
+      assert.ok(controller);
+    });
+  },
+);
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/credential/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/credential/index-test.js
new file mode 100644
index 000000000..d7dd7c6b3
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/credential/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/credential-stores/credential-store/credentials/credential/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/credential-stores/credential-store/credentials/credential/index',
+      );
+      assert.ok(controller);
+    });
+  },
+);
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/index-test.js
new file mode 100644
index 000000000..c7f296c24
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/credentials/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/credential-stores/credential-store/credentials/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/credential-stores/credential-store/credentials/index',
+      );
+      assert.ok(controller);
+    });
+  },
+);
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/index-test.js
new file mode 100644
index 000000000..50dd6570a
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/credential-store/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/credential-stores/credential-store/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/credential-stores/credential-store/index',
+      );
+      assert.ok(controller);
+    });
+  },
+);
diff --git a/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/index-test.js b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/index-test.js
new file mode 100644
index 000000000..6edb78e60
--- /dev/null
+++ b/ui/admin/tests/unit/controllers/scopes/scope/credential-stores/index-test.js
@@ -0,0 +1,16 @@
+import { module, test } from 'qunit';
+import { setupTest } from 'ember-qunit';
+
+module(
+  'Unit | Controller | scopes/scope/credential-stores/index',
+  function (hooks) {
+    setupTest(hooks);
+
+    test('it exists', function (assert) {
+      let controller = this.owner.lookup(
+        'controller:scopes/scope/credential-stores/index',
+      );
+      assert.ok(controller);
+    });
+  },
+);