diff --git a/addons/core/translations/actions/en-us.yaml b/addons/core/translations/actions/en-us.yaml
index 118c5f601..9c97d54af 100644
--- a/addons/core/translations/actions/en-us.yaml
+++ b/addons/core/translations/actions/en-us.yaml
@@ -36,3 +36,4 @@ toggle-secret: Toggle secret visibility
 minimize: Minimize
 fullscreen: Fullscreen
 clear-all-filters: Clear all filters
+learn-more: Learn more
\ No newline at end of file
diff --git a/addons/core/translations/en-us.yaml b/addons/core/translations/en-us.yaml
index 12232d8a6..afe5d18f2 100644
--- a/addons/core/translations/en-us.yaml
+++ b/addons/core/translations/en-us.yaml
@@ -30,6 +30,8 @@ titles:
   label: Label
   value: Value
   no-results: No Results
+  choose-a-provider: Choose a provider
+  provider: Provider
   ip-addresses: Latest IP Addresses
 descriptions:
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
@@ -37,6 +39,8 @@ descriptions:
   create-but-not-list: You do not have permission to list {resource}, but you can create new instances.
   neither-list-nor-create: You do not have permission to list or create {resource}.
   no-results: We found no matching records.
+  choose-a-provider: 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.
+  provider: This is the provider for this host catalog. The format of the host set filters are specific to each provider.
 questions:
   delete-confirm: Are you sure you want to delete this resource?
   remove-confirm: Are you sure you want to remove this association?
diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 8204dce5d..e93ad3774 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -121,35 +121,19 @@ filter:
 tenant_id:
   label: Tenant ID
   help: The tenant (directory) ID for your Azure Active Directory application.
-  link-text: Learn more
 subscription_id:
   label: Subscription ID
   help: The subscription ID for the subscription with read access.
-  link-text: Learn more
 access_key_id:
   label: Access Key ID
   help: The access key ID found on the Security Credentials page in AWS.
-  link-text: Learn more
 secret_access_key:
   label: Secret Access Key
   help: The subscription ID for the subscription with read access.
-  link-text: Learn more
-region:
+region: 
   label: Region
-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.
-  help:
-  client:
-    label: Client ID
-    help: The client ID for the client you want Boundary to use.
-    link-text : Learn more
-  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.
-  filter:
-    label: Filter
-    help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider.
-    link-text: Learn more about using filters for Azure resources.
+secret: 
+  label: Client secret value
+  help: The client secret value for the client you want Boundary to use
 disable_credential_rotation:
-  label: Disable credential rotation
+  label: Disable credential rotation
\ No newline at end of file
diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 5b5b02e45..1341dcc76 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -84,7 +84,7 @@ host-catalog:
       title: Welcome to Host Catalogs
   actions:
     delete: Delete Host Catalog
-  help: 
+  help:
     static: Provide a list of hosts and host sets with static addresses
     dynamic: Automate discovery of target hosts and services on Azure or AWS
   types:
@@ -93,6 +93,10 @@ host-catalog:
     aws: AWS
     azure: Azure
     dynamic: Dynamic
+  form:
+    azure_client_id:
+      label: Client ID
+      help: The client ID for the client you want Boundary to use.
 host-set:
   title: Host Set
   title_plural: Host Sets
@@ -103,6 +107,10 @@ host-set:
     delete: Delete Host Set
     create-and-add-host: Create and Add Host
     add-hosts: Add Existing Host
+  form:
+    filter: 
+      label: Filter
+      help: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider
   messages:
     welcome:
       title: Welcome to Host Sets
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 a73aea7af..01cafbe7a 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -72,14 +72,12 @@
 
     <Rose::Separator />
     <form.fieldset>
-      <:title>{{t 'form.provider.label'}}</:title>
+      <:title>{{t 'titles.provider'}}</:title>
     </form.fieldset>
 
     <form.fieldset>
-      <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
-      <:description>{{t
-          'form.provider.choose_a_provider.description'
-        }}</:description>
+      <:title>{{t 'titles.choose-a-provider'}}</:title>
+      <:description>{{t 'descriptions.choose-a-provider'}}</:description>
 
       <:body>
         <form.radioGroup
@@ -105,8 +103,8 @@
     </form.fieldset>
   {{else}}
     <form.fieldset>
-      <:title>{{t 'form.provider.label'}}</:title>
-      <:description>{{t 'form.provider.description'}}</:description>
+      <:title>{{t 'titles.provider'}}</:title>
+      <:description>{{t 'descriptions.provider'}}</:description>
       <:body>
         <form.radioGroup
           @name='provider'
@@ -139,8 +137,7 @@
     @value={{@model.access_key_id}}
     @label={{t 'form.access_key_id.label'}}
     @helperText={{t 'form.access_key_id.help'}}
-    @linkText={{t 'form.access_key_id.link-text'}}
-    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    @linkText={{t 'actions.learn-more'}}
     readonly={{false}}
   />
 
@@ -150,8 +147,7 @@
     @value={{@model.secret_access_key}}
     @label={{t 'form.secret_access_key.label'}}
     @helperText={{t 'form.secret_access_key.help'}}
-    @linkText={{t 'form.secret_access_key.link-text'}}
-    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    @linkText={{t 'actions.learn-more'}}
     readonly={{false}}
   />
 
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 e5ad8c52c..d816e36a9 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -72,13 +72,11 @@
     <Rose::Separator />
 
     <form.fieldset>
-      <:title>{{t 'form.provider.label'}}</:title>
+      <:title>{{t 'titles.provider'}}</:title>
     </form.fieldset>
     <form.fieldset>
-      <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
-      <:description>{{t
-          'form.provider.choose_a_provider.description'
-        }}</:description>
+      <:title>{{t 'titles.choose-a-provider'}}</:title>
+      <:description>{{t 'descriptions.choose-a-provider'}}</:description>
 
       <:body>
         <form.radioGroup
@@ -105,8 +103,8 @@
   {{else}}
 
     <form.fieldset>
-      <:title>{{t 'form.provider.label'}}</:title>
-      <:description>{{t 'form.provider.description'}}</:description>
+      <:title>{{t 'titles.provider'}}</:title>
+      <:description>{{t 'descriptions.provider'}}</:description>
 
       <:body>
         <form.radioGroup
@@ -132,8 +130,8 @@
     @value={{@model.tenant_id}}
     @label={{t 'form.tenant_id.label'}}
     @helperText={{t 'form.tenant_id.help'}}
-    @linkText={{t 'form.tenant_id.link-text'}}
-    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    @linkText={{t 'actions.learn-more'}}
+    @link={{doc-url @doc}}
     readonly={{false}}
   />
 
@@ -143,8 +141,8 @@
     @value={{@model.subscription_id}}
     @label={{t 'form.subscription_id.label'}}
     @helperText={{t 'form.subscription_id.help'}}
-    @linkText={{t 'form.subscription_id.link-text'}}
-    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    @linkText={{t 'actions.learn-more'}}
+    @link={{doc-url @doc}}
     readonly={{false}}
   />
 
@@ -152,10 +150,20 @@
     @name='client_id'
     @type='client_id'
     @value={{@model.client_id}}
-    @label={{t 'form.provider.client.label'}}
-    @helperText={{t 'form.provider.client.help'}}
-    @linkText={{t 'form.provider.client.link-text'}}
-    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    @label={{t 'resources.host-catalog.form.azure_client_id.label'}}
+    @helperText={{t 'resources.host-catalog.form.azure_client_id.help'}}
+    @linkText={{t 'actions.learn-more'}}
+    @link={{doc-url @doc}}
+    readonly={{false}}
+  />
+
+  <form.input
+    @name='secret_value'
+    @type='secret_value'
+    @label={{t 'form.secret.label'}}
+    @helperText={{t 'form.secret.help'}}
+    @linkText={{t 'actions.learn-more'}}
+    @link={{doc-url @doc}}
     readonly={{false}}
   />
 
diff --git a/ui/admin/app/components/form/host-catalog/index.hbs b/ui/admin/app/components/form/host-catalog/index.hbs
index 90cebebc9..2af0d78a5 100644
--- a/ui/admin/app/components/form/host-catalog/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/index.hbs
@@ -4,4 +4,5 @@
   submit=@submit
   cancel=@cancel
   changeType=@changeType
+  doc=@doc
 }}
\ No newline at end of file
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 eef442099..58bfe36da 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -75,15 +75,12 @@
     {{#if @model.isPlugin}}
       <Rose::Separator />
       <form.fieldset>
-        <:title>{{t 'form.provider.label'}}</:title>
+        <:title>{{t 'titles.provider'}}</:title>
       </form.fieldset>
 
       <form.fieldset>
-        <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
-        <:description>{{t
-            'form.provider.choose_a_provider.description'
-          }}</:description>
-
+        <:title>{{t 'titles.choose-a-provider'}}</:title>
+        <:description>{{t 'descriptions.choose-a-provider'}}</:description>
         <:body>
           <form.radioGroup
             @name='provider'
diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
index 5e860c34e..3af6ce47f 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -54,8 +54,8 @@
   />
 
   <form.fieldset>
-    <:title>{{t 'form.provider.label'}}</:title>
-    <:description>{{t 'form.provider.description'}}</:description>
+    <:title>{{t 'titles.provider'}}</:title>
+    <:description>{{t 'descriptions.provider'}}</:description>
 
     <:body>
       <form.radioGroup
@@ -74,10 +74,9 @@
     </:body>
   </form.fieldset>
 
-  {{! placeholder for filter, update me when the model is ready }}
   <Rose::Form::Fieldset>
-    <:title>{{t 'form.provider.filter.label'}}</:title>
-    <:description>{{t 'form.provider.filter.help'}}</:description>
+    <:title>{{t 'resources.host-set.form.filter.label'}}</:title>
+    <:description>{{t 'resources.host-set.form.filter.help'}}</:description>
     <:body>
       {{#if @model.errors.filters}}
         <Rose::Form::Errors as |errors|>
diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs
index 2cd136d84..686cb70d4 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -54,8 +54,8 @@
   />
 
   <form.fieldset>
-    <:title>{{t 'form.provider.label'}}</:title>
-    <:description>{{t 'form.provider.description'}}</:description>
+    <:title>{{t 'titles.provider'}}</:title>
+    <:description>{{t 'descriptions.provider'}}</:description>
 
     <:body>
       <form.radioGroup
@@ -74,14 +74,13 @@
     </:body>
   </form.fieldset>
 
-  {{! placeholder for filter, update me when the model is ready }}
   <form.textarea
     @name='filter'
     @type='filter'
     @value={{@model.filter}}
-    @label={{t 'form.provider.filter.label'}}
-    @helperText={{t 'form.provider.filter.help'}}
-    @linkText={{t 'form.provider.filter.link-text'}}
+    @label={{t 'resources.host-set.form.filter.label'}}
+    @helperText={{t 'resources.host-set.form.filter.help'}}
+    @linkText={{t 'form. tiltes.learn-more'}}
     @error={{@model.errors.description}}
     disabled={{@model.isSaving}}
     readonly={{false}}
diff --git a/ui/admin/app/components/form/host/aws/index.hbs b/ui/admin/app/components/form/host/aws/index.hbs
index 7ca35ec66..9aab28192 100644
--- a/ui/admin/app/components/form/host/aws/index.hbs
+++ b/ui/admin/app/components/form/host/aws/index.hbs
@@ -54,7 +54,7 @@
   </form.textarea>
 
   <form.fieldset>
-    <:title>{{t 'form.provider.label'}}</:title>
+    <:title>{{t 'titles.provider'}}</:title>
     <:body>
       <form.radioGroup
         @name='provider'
diff --git a/ui/admin/app/components/form/host/azure/index.hbs b/ui/admin/app/components/form/host/azure/index.hbs
index 321f94223..0a953f550 100644
--- a/ui/admin/app/components/form/host/azure/index.hbs
+++ b/ui/admin/app/components/form/host/azure/index.hbs
@@ -54,7 +54,7 @@
   </form.textarea>
 
   <form.fieldset>
-    <:title>{{t 'form.provider.label'}}</:title>
+    <:title>{{t 'titles.provider'}}</:title>
     <:body>
       <form.radioGroup
         @name='provider'
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
index 68fad6fd1..682fc6026 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/new.hbs
@@ -19,6 +19,7 @@
       @submit={{route-action 'save' @model}}
       @cancel={{route-action 'cancel' @model}}
       @changeType={{route-action 'changeType'}}
+      @doc='host-catalog.set-up-cloud-hosts'
     />
   </page.body>
 
diff --git a/ui/admin/config/environment.js b/ui/admin/config/environment.js
index f5d8c53b9..cd6e3a020 100644
--- a/ui/admin/config/environment.js
+++ b/ui/admin/config/environment.js
@@ -53,6 +53,7 @@ module.exports = function (environment) {
         'group.add-members': '/groups/add-members',
         'host-catalog': '/host-catalogs',
         'host-catalog.new': '/host-catalogs/new',
+        'host-catalog.set-up-cloud-hosts': '/host-catalog-set-up-cloud-hosts',
         'host-set': '/host-sets',
         'host-set.new': '/host-sets/new',
         'host-set.add-hosts': '/host-sets/add-hosts',