diff --git a/ui/admin/app/components/form/host-catalog/aws/index.hbs b/ui/admin/app/components/form/host-catalog/aws/index.hbs
index 5ee973c81..142ac44fd 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -101,25 +101,16 @@
       </:body>
     </form.fieldset>
   {{else}}
-    <form.fieldset>
-      <:title>{{t 'titles.provider'}}</:title>
-      <:description>{{t 'descriptions.provider'}}</:description>
-      <:body>
-        <form.radioGroup
-          @name='provider'
-          @selectedValue={{@model.compositeType}}
-          @disabled={{true}}
-          as |radioGroup|
-        >
-          <radioGroup.card
-            @label={{t 'resources.host-catalog.types.aws'}}
-            @value='aws'
-            @layout='tile'
-            @icon='flight-icons/svg/aws-color-16'
-          />
-        </form.radioGroup>
-      </:body>
-    </form.fieldset>
+    <InfoField
+      @value={{t 'resources.host-catalog.types.aws'}}
+      @icon='aws-color'
+      disabled={{form.disabled}}
+      as |F|
+    >
+      <F.Label>{{t 'titles.provider'}}</F.Label>
+      <F.HelperText>{{t 'descriptions.provider'}}
+      </F.HelperText>
+    </InfoField>
   {{/if}}
 
   <form.input
diff --git a/ui/admin/app/components/form/host-catalog/azure/index.hbs b/ui/admin/app/components/form/host-catalog/azure/index.hbs
index 584afc5fe..a09a3d411 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -106,27 +106,16 @@
       </:body>
     </form.fieldset>
   {{else}}
-
-    <form.fieldset>
-      <:title>{{t 'titles.provider'}}</:title>
-      <:description>{{t 'descriptions.provider'}}</:description>
-
-      <:body>
-        <form.radioGroup
-          @name='provider'
-          @selectedValue={{@model.compositeType}}
-          @disabled={{true}}
-          as |radioGroup|
-        >
-          <radioGroup.card
-            @label={{t 'resources.host-catalog.types.azure'}}
-            @value='azure'
-            @layout='tile'
-            @icon='flight-icons/svg/azure-color-16'
-          />
-        </form.radioGroup>
-      </:body>
-    </form.fieldset>
+    <InfoField
+      @value={{t 'resources.host-catalog.types.azure'}}
+      @icon='azure-color'
+      disabled={{form.disabled}}
+      as |F|
+    >
+      <F.Label>{{t 'titles.provider'}}</F.Label>
+      <F.HelperText>{{t 'descriptions.provider'}}
+      </F.HelperText>
+    </InfoField>
   {{/if}}
 
   <form.input
diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss
index a99fbd19c..67bf14b10 100644
--- a/ui/admin/app/styles/app.scss
+++ b/ui/admin/app/styles/app.scss
@@ -469,7 +469,6 @@
       grid-area: helper-text;
       font-size: sizing.rems(m);
       color: var(--token-form-label-color);
-
     }
 
     .hds-form-text-input {
@@ -480,8 +479,6 @@
       line-height: sizing.rems(m) + sizing.rems(xxs);
       padding: 0;
     }
-
-
   }
 
   &.has-icon {