diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 35e000970..27e3497c0 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -98,8 +98,12 @@ host-catalog:
       label: Dynamic
       help: Automate discovery of target hosts and services on Azure or AWS
   form:
-    provider_details: 
+    provider:
       label: Provider Details
+      description: This is the provider for this host catalog. The format of the host set filters are specific to each provider.
+      choose_a_provider: 
+        label: Choose a provider 
+        description: There are several built-in plugins for the most common providers. You can choose from on of the included plugins or use a custom plugin.
 host-set:
   title: Host Set
   title_plural: Host Sets
diff --git a/addons/rose/addon/styles/rose/components/form/_radio-card.scss b/addons/rose/addon/styles/rose/components/form/_radio-card.scss
index 5e8018b40..d8b69c896 100644
--- a/addons/rose/addon/styles/rose/components/form/_radio-card.scss
+++ b/addons/rose/addon/styles/rose/components/form/_radio-card.scss
@@ -61,7 +61,7 @@ $radio-svg: (
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  margin: $size-m $size-xs $size-xl 0;
+  margin: $size-m $size-xs $size-m 0;
 
   .radio-card-overlay {
     position: absolute;
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 77dfc8a52..d343e3cdd 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -73,11 +73,18 @@
     </form.fieldset>
 
     <Rose::Separator />
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+    </form.fieldset>
 
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
+          'resources.host-catalog.form.provider.choose_a_provider.label'
         }}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.choose_a_provider.description'
+        }}</:description>
+
       <:body>
         <form.radioGroup
           @name='provider'
@@ -102,9 +109,10 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
-        }}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.description'
+        }}</:description>
       <:body>
         <form.radioGroup
           @name='provider'
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 286d87f93..468416242 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -47,11 +47,15 @@
   </form.textarea>
 
   {{#if @model.isNew}}
+    {{!-- <form.label>{{t
+          'resources.host-catalog.form.provider.label'
+        }}</form.label> --}}
+
     <form.fieldset>
       <:title>{{t 'form.type.label'}}</:title>
       <:body>
         <form.radioGroup
-          @name='provider'
+          @name='types'
           @selectedValue={{@model.type}}
           @changed={{@changeType}}
           as |radioGroup|
@@ -72,10 +76,18 @@
       </:body>
     </form.fieldset>
     <Rose::Separator />
+
+    <form.fieldset>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+    </form.fieldset>
     <form.fieldset>
       <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
+          'resources.host-catalog.form.provider.choose_a_provider.label'
         }}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.choose_a_provider.description'
+        }}</:description>
+
       <:body>
         <form.radioGroup
           @name='provider'
@@ -99,10 +111,13 @@
       </:body>
     </form.fieldset>
   {{else}}
+
     <form.fieldset>
-      <:title>{{t
-          'resources.host-catalog.form.provider_details.label'
-        }}</:title>
+      <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      <:description>{{t
+          'resources.host-catalog.form.provider.description'
+        }}</:description>
+
       <:body>
         <form.radioGroup
           @name='provider'
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 548a66288..bc0ac2421 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_type'
+          @name='types'
           @selectedValue={{@model.type}}
           @changed={{@changeType}}
           as |radioGroup|
@@ -74,10 +74,18 @@
 
     {{#if @model.isPlugin}}
       <Rose::Separator />
+      <form.fieldset>
+        <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+      </form.fieldset>
+
       <form.fieldset>
         <:title>{{t
-            'resources.host-catalog.form.provider_details.label'
+            'resources.host-catalog.form.provider.choose_a_provider.label'
           }}</:title>
+        <:description>{{t
+            'resources.host-catalog.form.provider.choose_a_provider.description'
+          }}</:description>
+
         <:body>
           <form.radioGroup
             @name='provider'
diff --git a/ui/admin/tests/acceptance/host-catalogs/create-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
index 1dfd696e3..f07467f8e 100644
--- a/ui/admin/tests/acceptance/host-catalogs/create-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -81,7 +81,7 @@ module('Acceptance | host-catalogs | create', function (hooks) {
     await visit(urls.newStaticHostCatalog);
     await fillIn('[name="name"]', 'random string');
     await fillIn('[name="description"]', 'random string');
-    await fillIn('[name="static_type"]', 'static');
+    await fillIn('[name="types"]', 'static');
     await click('[type="submit"]');
     assert.equal(gethostCatalogCount(), count + 1);
   });