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 8a12ed1df..7b294e368 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -72,11 +72,13 @@
       </:body>
     </form.fieldset>
 
+    <Rose::Separator />
+
     <form.fieldset>
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws-plugins'
+          @name='aws_plugins'
           @selectedValue={{@model.compositeType}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -84,14 +86,12 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
           />
@@ -103,7 +103,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws-plugin'
+          @name='aws_plugin'
           @selectedValue={{@model.compositeType}}
           @disabled={{true}}
           as |radioGroup|
@@ -111,7 +111,6 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
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 b3e0bfbd6..bdf8e15c0 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='azure-plugins'
+          @name='azure_plugins'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -71,12 +71,12 @@
         </form.radioGroup>
       </:body>
     </form.fieldset>
-
+    <Rose::Separator />
     <form.fieldset>
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='aws-plugins'
+          @name='aws_plugins'
           @selectedValue={{@model.compositeType}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -84,14 +84,12 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.aws'}}
             @value='aws'
-            @helperText={{t 'resources.host-catalog.form.types.static.help'}}
             @layout='tile'
             @icon='flight-icons/svg/aws-color-16'
           />
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
           />
@@ -103,7 +101,7 @@
       <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
       <:body>
         <form.radioGroup
-          @name='azure-plugin'
+          @name='azure_plugin'
           @selectedValue={{@model.compositeType}}
           @disabled={{true}}
           as |radioGroup|
@@ -111,7 +109,6 @@
           <radioGroup.card
             @label={{t 'resources.host-catalog.types.azure'}}
             @value='azure'
-            @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
             @layout='tile'
             @icon='flight-icons/svg/azure-color-16'
           />
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 be34effa8..232b63797 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -51,7 +51,7 @@
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='static-types'
+          @name='static_types'
           @selectedValue={{@model.type}}
           @changed={{route-action 'changeType'}}
           as |radioGroup|
@@ -73,11 +73,12 @@
     </form.fieldset>
 
     {{#if @model.isPlugin}}
+      <Rose::Separator />
       <form.fieldset>
         <:title>{{t 'resources.host-catalog.form.provider-details'}}</:title>
         <:body>
           <form.radioGroup
-            @name='aws-plugins'
+            @name='aws_plugins'
             @selectedValue={{@model.compositeType}}
             @changed={{route-action 'changeType'}}
             as |radioGroup|
@@ -85,13 +86,11 @@
             <radioGroup.card
               @label={{t 'resources.host-catalog.types.aws'}}
               @value='aws'
-              @helperText={{t 'resources.host-catalog.types.static.help'}}
               @layout='tile'
             />
             <radioGroup.card
               @label={{t 'resources.host-catalog.types.azure'}}
               @value='azure'
-              @helperText={{t 'resources.host-catalog.form.types.dynamic.help'}}
               @layout='tile'
             />
           </form.radioGroup>
diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index 1cfafabe7..68cfd6599 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -86,7 +86,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     );
     await fillIn('[name="name"]', 'random string');
     await fillIn('[name="description"]', 'random string');
-    await fillIn('[name="types"]', 'static');
+    await fillIn('[name="static_types"]', 'static');
     await click('[type="submit"]');
     assert.equal(gethostCatalogCount(), count + 1);
   });