diff --git a/ui/admin/app/components/form/credential/json/index.hbs b/ui/admin/app/components/form/credential/json/index.hbs
index 4188565cb..5e8389919 100644
--- a/ui/admin/app/components/form/credential/json/index.hbs
+++ b/ui/admin/app/components/form/credential/json/index.hbs
@@ -48,42 +48,38 @@
   </Hds::Form::Textarea::Field>
 
   {{#if @model.isNew}}
-    <form.fieldset>
-      <:body>
-        <Hds::Form::RadioCard::Group as |G|>
-          <G.Legend>{{t 'form.type.label'}}</G.Legend>
-          {{#each @types as |credentialType|}}
-            <G.RadioCard
-              @name={{credentialType}}
-              @value={{credentialType}}
-              @checked={{eq credentialType @model.type}}
-              @maxWidth='20rem'
-              {{on 'input' (fn @changeType credentialType)}}
-              as |R|
-            >
-              <R.Label>{{t
-                  (concat 'resources.credential.types.' credentialType)
-                }}</R.Label>
-              <R.Description>{{t
-                  (concat 'resources.credential.help.' credentialType)
-                }}</R.Description>
-            </G.RadioCard>
-          {{/each}}
-        </Hds::Form::RadioCard::Group>
-      </:body>
-    </form.fieldset>
+    <Hds::Form::RadioCard::Group as |G|>
+      <G.Legend>{{t 'form.type.label'}}</G.Legend>
+      {{#each @types as |credentialType|}}
+        <G.RadioCard
+          @name={{credentialType}}
+          @value={{credentialType}}
+          @checked={{eq credentialType @model.type}}
+          @maxWidth='20rem'
+          {{on 'input' (fn @changeType credentialType)}}
+          as |R|
+        >
+          <R.Label>{{t (concat 'resources.credential.types.' credentialType)}}
+          </R.Label>
+          <R.Description>{{t
+              (concat 'resources.credential.help.' credentialType)
+            }}
+          </R.Description>
+        </G.RadioCard>
+      {{/each}}
+    </Hds::Form::RadioCard::Group>
 
-    <form.fieldset>
-      <:title>{{t 'resources.credential.form.json.label'}}</:title>
-      <:description>{{t 'resources.credential.form.json.help'}}</:description>
-      <:body>
+    <Hds::Form::Fieldset as |F|>
+      <F.Legend>{{t 'resources.credential.form.json.label'}}</F.Legend>
+      <F.HelperText>{{t 'resources.credential.form.json.help'}}</F.HelperText>
+      <F.Control>
         <Form::Field::JsonSecret
           @value={{@model.json_object}}
           @onInput={{fn (mut @model.json_object)}}
           @showEditButton={{false}}
         />
-      </:body>
-    </form.fieldset>
+      </F.Control>
+    </Hds::Form::Fieldset>
   {{else}}
     <InfoField
       @value={{t (concat 'resources.credential.types.' @model.type)}}
@@ -94,18 +90,18 @@
       </F.HelperText>
     </InfoField>
 
-    <form.fieldset>
-      <:title>{{t 'resources.credential.form.json.label'}}</:title>
-      <:description>{{t 'resources.credential.form.json.help'}}</:description>
-      <:body>
+    <Hds::Form::Fieldset as |F|>
+      <F.Legend>{{t 'resources.credential.form.json.label'}}</F.Legend>
+      <F.HelperText>{{t 'resources.credential.form.json.help'}}</F.HelperText>
+      <F.Control>
         <Form::Field::JsonSecret
           @disabled={{form.disabled}}
           @value={{@model.json_object}}
           @onInput={{fn (mut @model.json_object)}}
           @showEditButton={{true}}
         />
-      </:body>
-    </form.fieldset>
+      </F.Control>
+    </Hds::Form::Fieldset>
   {{/if}}
 
   {{#if (can 'save model' @model)}}