diff --git a/addons/core/translations/en-us.yaml b/addons/core/translations/en-us.yaml
index 73a720d62..1da3accf0 100644
--- a/addons/core/translations/en-us.yaml
+++ b/addons/core/translations/en-us.yaml
@@ -30,12 +30,21 @@ titles:
   label: Label
   value: Value
   no-results: No Results
+  learn-more: Learn more
+  choose-a-provider: Choose a provider
+  provider: Provider
+  filter: Filter
+  secret: Client secret value
 descriptions:
   empty-set: There are no items to display yet.  You may be able to add items or try back later.
   origin-initialization: To get started, please enter your origin URL
   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.
+  filter: Create a filter to select resources using values such as tag name or tag value. Filter format is specific to each provider
+  secret: The client secret value for the client you want Boundary to use
 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 322544be7..8aef87403 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -121,37 +121,17 @@ 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: 
   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
-    secret: 
-      label: Client secret value
-      help: The client secret value 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.
+azure_client_id: 
+  label: Client ID
+  help: The client ID for the client you want Boundary to use.
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 36ebed43a..7a15bee5a 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -74,14 +74,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
@@ -107,8 +105,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'
@@ -141,8 +139,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 'titles.learn-more'}}
     readonly={{false}}
   />
 
@@ -152,8 +149,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 'titles.learn-more'}}
     readonly={{false}}
   />
   {{#if (can 'save model' @model)}}
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 9d8109f86..007a83426 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -74,13 +74,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
@@ -107,8 +105,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
@@ -134,8 +132,7 @@
     @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 'titles.learn-more'}}
     readonly={{false}}
   />
 
@@ -145,8 +142,7 @@
     @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 'titles.learn-more'}}
     readonly={{false}}
   />
 
@@ -154,20 +150,18 @@
     @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 'form.azure_client_id.label'}}
+    @helperText={{t 'form.azure_client_id.help'}}
+    @linkText={{t 'titles.learn-more'}}
     readonly={{false}}
   />
 
   <form.input
     @name='secret_value'
     @type='secret_value'
-    @label={{t 'form.provider.client.secret.label'}}
-    @helperText={{t 'form.provider.client.secret.help'}}
-    @linkText={{t 'form.provider.client.secret.link-text'}}
-    @link='https://learn.hashicorp.com/tutorials/boundary/cloud-host-catalogs#set-up-cloud-hosts'
+    @label={{t 'titles.secret'}}
+    @helperText={{t 'descriptions.secret'}}
+    @linkText={{t 'titles.learn-more'}}
     readonly={{false}}
   />
 
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 f0d4c01d5..c16344732 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -75,14 +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
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 336972b1a..9d00ff2a4 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
@@ -76,8 +76,8 @@
 
   {{! 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 'titles.filter'}}</:title>
+    <:description>{{t 'descriptions.filter'}}</: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 6dff36ff0..048b7b042 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
@@ -79,9 +79,9 @@
     @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 'titles.filter'}}
+    @helperText={{t 'descriptions.filter'}}
+    @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 9f6351ab7..fc4359687 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 e509f0458..00ef8f19e 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'