diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index c984eb194..b8076beb2 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -319,6 +319,8 @@ credential-store:
   types:
     vault: Vault
     static: Static
+  help:
+    vault: The host details are brokered by a Vault server.
   form:
     address:
       label: Address
diff --git a/ui/admin/app/components/form/credential-store/index.hbs b/ui/admin/app/components/form/credential-store/index.hbs
index 1bf4344a0..c887438f1 100644
--- a/ui/admin/app/components/form/credential-store/index.hbs
+++ b/ui/admin/app/components/form/credential-store/index.hbs
@@ -6,12 +6,47 @@
   @showEditToggle={{if @model.isNew false true}}
   as |form|
 >
-  <form.input
-    @value={{@model.type}}
-    @label={{t 'form.type.label'}}
-    readonly={{true}}
-    @disabled={{true}}
-  />
+  {{#if (feature-flag 'static-credentials')}}
+    <form.fieldset>
+      <:title>{{t 'form.type.label'}}</:title>
+      <:body>
+        {{#if @model.isNew}}
+          {{! Code to allow option to select between cred. store types (vault or static) when it is first created goes here}}
+          <form.input
+            @value={{@model.type}}
+            readonly={{true}}
+            @disabled={{true}}
+          />
+        {{else}}
+          <form.radioGroup
+            @name='types'
+            @selectedValue={{@model.type}}
+            as |radioGroup|
+          >
+            <radioGroup.card
+              @label={{t
+                (concat 'resources.credential-store.types.' @model.type)
+              }}
+              @helperText={{t
+                (concat 'resources.credential-store.help.' @model.type)
+              }}
+              @value={{@model.type}}
+              @layout='wide'
+              readonly={{true}}
+              @disabled={{true}}
+            />
+          </form.radioGroup>
+        {{/if}}
+      </:body>
+    </form.fieldset>
+  {{else}}
+    <form.input
+      @value={{@model.type}}
+      @label={{t 'form.type.label'}}
+      readonly={{true}}
+      @disabled={{true}}
+    />
+  {{/if}}
 
   <form.input
     @name='name'