diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs b/ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-actions.hbs
rename to ui/admin/app/components/credential-stores/credential-store/actions/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs b/ui/admin/app/components/credential-stores/credential-store/header/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-header.hbs
rename to ui/admin/app/components/credential-stores/credential-store/header/index.hbs
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-navigation.hbs b/ui/admin/app/components/credential-stores/credential-store/nav/index.hbs
similarity index 100%
rename from ui/admin/app/templates/scopes/scope/credential-stores/credential-store/-navigation.hbs
rename to ui/admin/app/components/credential-stores/credential-store/nav/index.hbs
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library.js b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library.js
new file mode 100644
index 000000000..ec222f462
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library.js
@@ -0,0 +1,13 @@
+import Controller from '@ember/controller';
+
+export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrariesCredentialLibraryController extends Controller {
+  // =attributes
+
+  /**
+   * A model breadcrumb
+   * @type {string}
+   */
+  get breadCrumb() {
+    return this.model.displayName;
+  }
+}
diff --git a/ui/admin/app/controllers/scopes/scope/credential-stores/new.js b/ui/admin/app/controllers/scopes/scope/credential-stores/new.js
new file mode 100644
index 000000000..3f50abb13
--- /dev/null
+++ b/ui/admin/app/controllers/scopes/scope/credential-stores/new.js
@@ -0,0 +1,18 @@
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
+
+export default class ScopesScopeCredentialStoresNewController extends Controller {
+  // =services
+
+  @service intl;
+
+  // =attributes
+
+  /**
+   * Breadcrumb for new route
+   * @type {string}
+   */
+  get breadCrumb() {
+    return this.intl.t('titles.new');
+  }
+}
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 046b8a01c..e995f11b0 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
@@ -8,27 +8,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreRoute extends Rou
   async model({ credential_store_id }) {
     return this.store.findRecord('credential-store', credential_store_id);
   }
-
-  /**
-   * Render credential store header, navigation and actions page sections.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render('scopes/scope/credential-stores/credential-store/-header', {
-      into: 'scopes/scope/credential-stores/credential-store',
-      outlet: 'header',
-    });
-
-    this.render('scopes/scope/credential-stores/credential-store/-navigation', {
-      into: 'scopes/scope/credential-stores/credential-store',
-      outlet: 'navigation',
-    });
-
-    this.render('scopes/scope/credential-stores/credential-store/-actions', {
-      into: 'scopes/scope/credential-stores/credential-store',
-      outlet: 'actions',
-    });
-  }
 }
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 a8f8db78a..09eec86c6 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
@@ -81,7 +81,7 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
   @confirm('questions.delete-confirm')
   @notifyError(({ message }) => message, { catch: true })
   @notifySuccess('notifications.delete-success')
-  async delete(credentialLibrary) {
+  async deleteCredentialLibrary(credentialLibrary) {
     await credentialLibrary.destroyRecord();
     await this.router.replaceWith(
       'scopes.scope.credential-stores.credential-store.credential-libraries'
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 45f5953fb..00b935f23 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
@@ -14,36 +14,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
       reload: true,
     });
   }
-
-  /**
-   * Renders the credential library specific templates for header, navigation, and action page sections.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render(
-      'scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-header',
-      {
-        into: 'scopes/scope/credential-stores/credential-store',
-        outlet: 'header',
-      }
-    );
-
-    this.render(
-      'scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-navigation',
-      {
-        into: 'scopes/scope/credential-stores/credential-store',
-        outlet: 'navigation',
-      }
-    );
-
-    this.render(
-      'scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-actions',
-      {
-        into: 'scopes/scope/credential-stores/credential-store',
-        outlet: 'actions',
-      }
-    );
-  }
 }
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 c9ccc770c..d6c3db15b 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
@@ -16,31 +16,4 @@ export default class ScopesScopeCredentialStoresCredentialStoreCredentialLibrari
       credential_store_id,
     });
   }
-
-  /**
-   * Renders new credential library specific templates for header, navigation,
-   * and action page sections.
-   * @override
-   */
-  renderTemplate() {
-    super.renderTemplate(...arguments);
-
-    this.render(
-      'scopes/scope/credential-stores/credential-store/credential-libraries/new/-header',
-      {
-        into: 'scopes/scope/credential-stores/credential-store',
-        outlet: 'header',
-      }
-    );
-
-    this.render('_empty', {
-      into: 'scopes/scope/credential-stores/credential-store',
-      outlet: 'navigation',
-    });
-
-    this.render('_empty', {
-      into: 'scopes/scope/credential-stores/credential-store',
-      outlet: 'actions',
-    });
-  }
 }
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs
index efc46641a..7d32ecb0d 100644
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs
+++ b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store.hbs
@@ -1,24 +1,3 @@
 {{page-title @model.displayName}}
 
-<Rose::Layout::Page as |page|>
-
-  <page.breadcrumbs>
-    <BreadCrumbs />
-  </page.breadcrumbs>
-
-  <page.header>
-    {{outlet 'header'}}
-  </page.header>
-
-  <page.navigation>
-    {{outlet 'navigation'}}
-  </page.navigation>
-
-  <page.actions>
-    {{outlet 'actions'}}
-  </page.actions>
-
-  <page.body>
-    {{outlet}}
-  </page.body>
-</Rose::Layout::Page>
\ No newline at end of file
+{{outlet}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-actions.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-actions.hbs
deleted file mode 100644
index 4399f847b..000000000
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-actions.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-{{#if (can 'delete model' @model)}}
-  <Rose::Dropdown
-    @text={{t 'actions.manage'}}
-    @dropdownRight={{true}}
-    as |dropdown|
-  >
-    <dropdown.button
-      @style='danger'
-      @disabled={{@model.canSave}}
-      {{on 'click' (route-action 'delete' @model)}}
-    >
-      {{t 'resources.credential-library.actions.delete'}}
-    </dropdown.button>
-  </Rose::Dropdown>
-{{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-header.hbs
deleted file mode 100644
index 229448ada..000000000
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-header.hbs
+++ /dev/null
@@ -1,12 +0,0 @@
-<h2>
-  {{t 'resources.credential-library.title'}}
-  <DocLink @doc='credential-library' @iconSize='large' />
-</h2>
-<p>{{t 'resources.credential-library.description'}}</p>
-<Copyable
-  @text={{@model.id}}
-  @buttonText={{t 'actions.copy-to-clipboard'}}
-  @acknowledgeText={{t 'states.copied'}}
->
-  <code>{{@model.id}}</code>
-</Copyable>
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-navigation.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-navigation.hbs
deleted file mode 100644
index d5bb5cf63..000000000
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/credential-library/-navigation.hbs
+++ /dev/null
@@ -1,7 +0,0 @@
-<Rose::Nav::Tabs as |nav|>
-  <nav.link
-    @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library.index'
-  >
-    {{t 'titles.details'}}
-  </nav.link>
-</Rose::Nav::Tabs>
\ No newline at end of file
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 648221a43..fe4f7069e 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
@@ -1,5 +1,57 @@
-<Form::CredentialLibrary
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'resources.credential-library.title'}}
+      <DocLink @doc='credential-library' @iconSize='large' />
+    </h2>
+    <p>{{t 'resources.credential-library.description'}}</p>
+    <Copyable
+      @text={{@model.id}}
+      @buttonText={{t 'actions.copy-to-clipboard'}}
+      @acknowledgeText={{t 'states.copied'}}
+    >
+      <code>{{@model.id}}</code>
+    </Copyable>
+  </page.header>
+
+  <page.navigation>
+    <Rose::Nav::Tabs as |nav|>
+      <nav.link
+        @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library.index'
+      >
+        {{t 'titles.details'}}
+      </nav.link>
+    </Rose::Nav::Tabs>
+  </page.navigation>
+
+  <page.actions>
+    {{#if (can 'delete model' @model)}}
+      <Rose::Dropdown
+        @text={{t 'actions.manage'}}
+        @dropdownRight={{true}}
+        as |dropdown|
+      >
+        <dropdown.button
+          @style='danger'
+          @disabled={{@model.canSave}}
+          {{on 'click' (route-action 'deleteCredentialLibrary' @model)}}
+        >
+          {{t 'resources.credential-library.actions.delete'}}
+        </dropdown.button>
+      </Rose::Dropdown>
+    {{/if}}
+  </page.actions>
+
+  <page.body>
+    <Form::CredentialLibrary
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action '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 8f1b0ba98..d231ca381 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
@@ -1,102 +1,128 @@
-{{#if @model}}
+<Rose::Layout::Page as |page|>
 
-  <Rose::Table as |table|>
-    <table.header as |header|>
-      <header.row as |row|>
-        <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
-        <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-      </header.row>
-    </table.header>
-    <table.body as |body|>
-      {{#each @model as |credentialLibrary|}}
-        <body.row as |row|>
-          <row.headerCell>
-            {{#if (can 'read model' credentialLibrary)}}
-              <LinkTo
-                @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
-                @model={{credentialLibrary.id}}
-              >
-                {{credentialLibrary.displayName}}
-              </LinkTo>
-            {{else}}
-              {{credentialLibrary.displayName}}
-            {{/if}}
-            <p>{{credentialLibrary.description}}</p>
-          </row.headerCell>
-          <row.cell>
-            <Rose::Badge>{{t
-                (concat
-                  'resources.credential-library.types.' credentialLibrary.type
-                )
-              }}</Rose::Badge>
-          </row.cell>
-          <row.cell>
-            <Copyable
-              @text={{credentialLibrary.id}}
-              @buttonText={{t 'actions.copy-to-clipboard'}}
-              @acknowledgeText={{t 'states.copied'}}
-            >
-              <code>{{credentialLibrary.id}}</code>
-            </Copyable>
-          </row.cell>
-        </body.row>
-      {{/each}}
-    </table.body>
-  </Rose::Table>
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
 
-{{else}}
+  <page.header>
+    <CredentialStores::CredentialStore::Header
+      @model={{this.credentialStore}}
+    />
+  </page.header>
 
-  <Rose::Layout::Centered>
-    <Rose::Message
-      @title={{t 'resources.credential-library.messages.none.title'}}
-      as |message|
-    >
-      <message.description>
-        {{#if
-          (can
-            'list collection'
-            this.credentialStore
-            collection='credential-libraries'
-          )
-        }}
-          {{! can list (at least):  show default welcome message}}
-          {{t 'resources.credential-library.description'}}
+  <page.navigation>
+    <CredentialStores::CredentialStore::Nav @model={{this.credentialStore}} />
+  </page.navigation>
 
-        {{else if (can
-          'create collection'
-          this.credentialStore
-          collection='credential-libraries'
-        )}}
-          {{! can create (only):  show create-but-not-list welcome message}}
-          {{t
-            'descriptions.create-but-not-list'
-            resource=(t 'resources.credential-library.title_plural')
-          }}
-        {{else}}
-          {{! can neither list nor create }}
-          {{t
-            'descriptions.neither-list-nor-create'
-            resource=(t 'resources.credential-library.title_plural')
-          }}
-        {{/if}}
+  <page.actions>
+    <CredentialStores::CredentialStore::Actions
+      @model={{this.credentialStore}}
+    />
+  </page.actions>
 
-      </message.description>
-      {{#if
-        (can
-          'create collection'
-          this.credentialStore
-          collection='credential-libraries'
-        )
-      }}
-        <message.link
-          @route='scopes.scope.credential-stores.credential-store.credential-libraries.new'
+  <page.body>
+    {{#if @model}}
+
+      <Rose::Table as |table|>
+        <table.header as |header|>
+          <header.row as |row|>
+            <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
+            <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model as |credentialLibrary|}}
+            <body.row as |row|>
+              <row.headerCell>
+                {{#if (can 'read model' credentialLibrary)}}
+                  <LinkTo
+                    @route='scopes.scope.credential-stores.credential-store.credential-libraries.credential-library'
+                    @model={{credentialLibrary.id}}
+                  >
+                    {{credentialLibrary.displayName}}
+                  </LinkTo>
+                {{else}}
+                  {{credentialLibrary.displayName}}
+                {{/if}}
+                <p>{{credentialLibrary.description}}</p>
+              </row.headerCell>
+              <row.cell>
+                <Rose::Badge>{{t
+                    (concat
+                      'resources.credential-library.types.'
+                      credentialLibrary.type
+                    )
+                  }}</Rose::Badge>
+              </row.cell>
+              <row.cell>
+                <Copyable
+                  @text={{credentialLibrary.id}}
+                  @buttonText={{t 'actions.copy-to-clipboard'}}
+                  @acknowledgeText={{t 'states.copied'}}
+                >
+                  <code>{{credentialLibrary.id}}</code>
+                </Copyable>
+              </row.cell>
+            </body.row>
+          {{/each}}
+        </table.body>
+      </Rose::Table>
+
+    {{else}}
+
+      <Rose::Layout::Centered>
+        <Rose::Message
+          @title={{t 'resources.credential-library.messages.none.title'}}
+          as |message|
         >
-          <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
-          {{t 'titles.new'}}
-        </message.link>
-      {{/if}}
-    </Rose::Message>
-  </Rose::Layout::Centered>
+          <message.description>
+            {{#if
+              (can
+                'list collection'
+                this.credentialStore
+                collection='credential-libraries'
+              )
+            }}
+              {{! can list (at least):  show default welcome message}}
+              {{t 'resources.credential-library.description'}}
 
-{{/if}}
\ No newline at end of file
+            {{else if (can
+              'create collection'
+              this.credentialStore
+              collection='credential-libraries'
+            )}}
+              {{! can create (only):  show create-but-not-list welcome message}}
+              {{t
+                'descriptions.create-but-not-list'
+                resource=(t 'resources.credential-library.title_plural')
+              }}
+            {{else}}
+              {{! can neither list nor create }}
+              {{t
+                'descriptions.neither-list-nor-create'
+                resource=(t 'resources.credential-library.title_plural')
+              }}
+            {{/if}}
+
+          </message.description>
+          {{#if
+            (can
+              'create collection'
+              this.credentialStore
+              collection='credential-libraries'
+            )
+          }}
+            <message.link
+              @route='scopes.scope.credential-stores.credential-store.credential-libraries.new'
+            >
+              <Rose::Icon @name='flight-icons/svg/plus-circle-16' />
+              {{t 'titles.new'}}
+            </message.link>
+          {{/if}}
+        </Rose::Message>
+      </Rose::Layout::Centered>
+
+    {{/if}}
+  </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/new.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new.hbs
index 5d03e5b9f..818471682 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
@@ -1,7 +1,22 @@
 {{page-title (t 'titles.new')}}
 
-<Form::CredentialLibrary
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <h2>
+      {{t 'titles.new'}}
+    </h2>
+  </page.header>
+
+  <page.body>
+    <Form::CredentialLibrary
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action '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/new/-header.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new/-header.hbs
deleted file mode 100644
index 51755b136..000000000
--- a/ui/admin/app/templates/scopes/scope/credential-stores/credential-store/credential-libraries/new/-header.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-<h2>
-  {{t 'titles.new'}}
-</h2>
\ 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 aaa14a18c..78a8548a2 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
@@ -1,5 +1,26 @@
-<Form::CredentialStore
-  @model={{@model}}
-  @submit={{route-action 'save' @model}}
-  @cancel={{route-action 'cancel' @model}}
-/>
\ No newline at end of file
+<Rose::Layout::Page as |page|>
+
+  <page.breadcrumbs>
+    <BreadCrumbs />
+  </page.breadcrumbs>
+
+  <page.header>
+    <CredentialStores::CredentialStore::Header @model={{@model}} />
+  </page.header>
+
+  <page.navigation>
+    <CredentialStores::CredentialStore::Nav @model={{@model}} />
+  </page.navigation>
+
+  <page.actions>
+    <CredentialStores::CredentialStore::Actions @model={{@model}} />
+  </page.actions>
+
+  <page.body>
+    <Form::CredentialStore
+      @model={{@model}}
+      @submit={{route-action 'save' @model}}
+      @cancel={{route-action 'cancel' @model}}
+    />
+  </page.body>
+</Rose::Layout::Page>
\ No newline at end of file