diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 4ac6c4023..308161cb1 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -78,6 +78,7 @@ host-catalog:
   title: Host Catalog
   title_plural: Host Catalogs
   description: A host catalog is a collection of hosts and host sets.
+  type: Type
   messages:
     welcome:
       title: Welcome to Host Catalogs
diff --git a/ui/admin/app/components/form/host-catalog/static/index.hbs b/ui/admin/app/components/form/host-catalog/static/index.hbs
index b77d02fa5..1c88faefc 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -42,21 +42,25 @@
       </field.errors>
     {{/if}}
   </form.textarea>
-
-  <Rose::Form::Radio::Group @name='types' as |radioGroup|>
-    <radioGroup.card
-      @label={{t 'resources.host-catalog.types.static'}}
-      @value='static'
-      @helperText={{t 'resources.host-catalog.form.types.static.help'}}
-      @layout='tile'
-    />
-    <radioGroup.card
-      @label={{t 'resources.host-catalog.types.dynamic'}}
-      @value='dynamic'
-      @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
-      @layout='tile'
-    />
-  </Rose::Form::Radio::Group>
+  <form.fieldset>
+    <:title>{{t 'resources.host-catalog.type'}}</:title>
+    <:body>
+      <form.radioGroup @name='types' as |radioGroup|>
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.static'}}
+          @value='static'
+          @helperText={{t 'resources.host-catalog.form.types.static.help'}}
+          @layout='wide'
+        />
+        <radioGroup.card
+          @label={{t 'resources.host-catalog.types.dynamic'}}
+          @value='dynamic'
+          @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
+          @layout='wide'
+        />
+      </form.radioGroup>
+    </:body>
+  </form.fieldset>
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}
@@ -65,4 +69,6 @@
       @cancelText={{t 'actions.cancel'}}
     />
   {{/if}}
-</Rose::Form>
\ No newline at end of file
+</Rose::Form>
+
+{{{log @model.compositeType 'compostite type'}}}
\ No newline at end of file