diff --git a/ui/admin/app/components/form/credential/ssh_private_key/index.hbs b/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
index 3d430ef79..78521aa81 100644
--- a/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
+++ b/ui/admin/app/components/form/credential/ssh_private_key/index.hbs
@@ -43,10 +43,10 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-  <form.fieldset>
-    <:title>{{t 'form.type.label'}}</:title>
-    <:body>
-      {{#if @model.isNew}}
+  {{#if @model.isNew}}
+    <form.fieldset>
+      <:title>{{t 'form.type.label'}}</:title>
+      <:body>
         <form.radioGroup
           @name='types'
           @selectedValue={{@model.type}}
@@ -66,24 +66,23 @@
             @layout='wide'
           />
         </form.radioGroup>
-      {{else}}
-        <form.radioGroup
-          @name='types'
-          @selectedValue={{@model.type}}
-          as |radioGroup|
-        >
-          <radioGroup.card
-            @label={{t (concat 'resources.credential.types.' @model.type)}}
-            @helperText={{t (concat 'resources.credential.help.' @model.type)}}
-            @value={{@model.type}}
-            @layout='wide'
-            @disabled={{true}}
-            readonly={{true}}
-          />
-        </form.radioGroup>
-      {{/if}}
-    </:body>
-  </form.fieldset>
+      </:body>
+    </form.fieldset>
+  {{else}}
+    <form.fieldset>
+      <:title>{{t 'form.type.label'}}</:title>
+      <:description>
+        <Rose::Form::Label>
+          {{t (concat 'resources.credential.types.' @model.type)}}
+        </Rose::Form::Label>
+      </:description>
+      <:body>
+        <Rose::Form::HelperText>{{t
+            (concat 'resources.credential.help.' @model.type)
+          }}</Rose::Form::HelperText>
+      </:body>
+    </form.fieldset>
+  {{/if}}
 
   <form.input
     @name='username'
diff --git a/ui/admin/app/components/form/credential/username_password/index.hbs b/ui/admin/app/components/form/credential/username_password/index.hbs
index 6f7ea1600..193ad220b 100644
--- a/ui/admin/app/components/form/credential/username_password/index.hbs
+++ b/ui/admin/app/components/form/credential/username_password/index.hbs
@@ -43,10 +43,10 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-  <form.fieldset>
-    <:title>{{t 'form.type.label'}}</:title>
-    <:body>
-      {{#if @model.isNew}}
+  {{#if @model.isNew}}
+    <form.fieldset>
+      <:title>{{t 'form.type.label'}}</:title>
+      <:body>
         <form.radioGroup
           @name='types'
           @selectedValue={{@model.type}}
@@ -66,24 +66,23 @@
             @layout='wide'
           />
         </form.radioGroup>
-      {{else}}
-        <form.radioGroup
-          @name='types'
-          @selectedValue={{@model.type}}
-          as |radioGroup|
-        >
-          <radioGroup.card
-            @label={{t (concat 'resources.credential.types.' @model.type)}}
-            @helperText={{t (concat 'resources.credential.help.' @model.type)}}
-            @value={{@model.type}}
-            @layout='wide'
-            @disabled={{true}}
-            readonly={{true}}
-          />
-        </form.radioGroup>
-      {{/if}}
-    </:body>
-  </form.fieldset>
+      </:body>
+    </form.fieldset>
+  {{else}}
+    <form.fieldset>
+      <:title>{{t 'form.type.label'}}</:title>
+      <:description>
+        <Rose::Form::Label>
+          {{t (concat 'resources.credential.types.' @model.type)}}
+        </Rose::Form::Label>
+      </:description>
+      <:body>
+        <Rose::Form::HelperText>{{t
+            (concat 'resources.credential.help.' @model.type)
+          }}</Rose::Form::HelperText>
+      </:body>
+    </form.fieldset>
+  {{/if}}
 
   <form.input
     @name='username'