diff --git a/addons/api/addon/models/credential-store.js b/addons/api/addon/models/credential-store.js
index 67e934874..c0c2432f8 100644
--- a/addons/api/addon/models/credential-store.js
+++ b/addons/api/addon/models/credential-store.js
@@ -1,6 +1,8 @@
import GeneratedCredentialStoreModel from '../generated/models/credential-store';
import { equal } from '@ember/object/computed';
+export const types = ['static', 'vault'];
+
export default class CredentialStoreModel extends GeneratedCredentialStoreModel {
// =attributes
diff --git a/addons/rose/addon/styles/hds/overrides.scss b/addons/rose/addon/styles/hds/overrides.scss
index 211921f2a..0b593f703 100644
--- a/addons/rose/addon/styles/hds/overrides.scss
+++ b/addons/rose/addon/styles/hds/overrides.scss
@@ -1,4 +1,5 @@
// field bottom margin (HDS leaves this to implementers)
-[class^='hds-form-field'] {
+[class^='hds-form-field'],
+[class^='hds-form-group'] {
margin-bottom: 1.5rem;
}
diff --git a/ui/admin/app/components/form/credential-store/static/index.hbs b/ui/admin/app/components/form/credential-store/static/index.hbs
index d21406ec7..0dbb997dc 100644
--- a/ui/admin/app/components/form/credential-store/static/index.hbs
+++ b/ui/admin/app/components/form/credential-store/static/index.hbs
@@ -46,46 +46,42 @@
{{#if (feature-flag 'static-credentials')}}
{{#if @model.isNew}}
-
- <:title>{{t 'form.type.label'}}
- <:body>
-
+ {{t 'form.type.label'}}
+ {{#each-in this.mapResourceTypewithIcon as |credentialStoreType icon|}}
+
-
-
-
-
-
+ {{t
+ (concat 'resources.credential-store.types.' credentialStoreType)
+ }}
+ {{t
+ (concat 'resources.credential-store.help.' credentialStoreType)
+ }}
+
+
+ {{/each-in}}
+
{{else}}
{{t 'form.type.label'}}
{{t
- (concat 'resources.credential-store.help.' @model.type)
+ (concat 'resources.credential-store.types.' @model.type)
}}
{{/if}}
-
{{/if}}
-
{{#if (can 'save model' @model)}}
({ ...obj, [type]: icons[i] }), {});
+ }
+}
diff --git a/ui/admin/app/components/form/credential-store/vault/index.hbs b/ui/admin/app/components/form/credential-store/vault/index.hbs
index ff781bc1f..fcc1196be 100644
--- a/ui/admin/app/components/form/credential-store/vault/index.hbs
+++ b/ui/admin/app/components/form/credential-store/vault/index.hbs
@@ -46,77 +46,42 @@
{{#if (feature-flag 'static-credentials')}}
-
- <:title>{{t 'form.type.label'}}
- <:body>
- {{#if @model.isNew}}
-
+ {{t 'form.type.label'}}
+ {{#each-in this.mapResourceTypewithIcon as |credentialStoreType icon|}}
+
-
-
-
- {{else}}
-
-
-
- {{/if}}
-
-
- {{else}}
-
- <:title>{{t 'form.type.label'}}
- <:body>
-
-
-
-
-
+ {{t
+ (concat 'resources.credential-store.types.' credentialStoreType)
+ }}
+ {{t
+ (concat 'resources.credential-store.help.' credentialStoreType)
+ }}
+
+
+ {{/each-in}}
+
+ {{else}}
+
+ {{t 'form.type.label'}}
+ {{t
+ (concat 'resources.credential-store.types.' @model.type)
+ }}
+
+
+ {{/if}}
{{/if}}
-
({ ...obj, [type]: icons[i] }), {});
+ }
+}