diff --git a/addons/core/translations/form/en-us.yaml b/addons/core/translations/form/en-us.yaml
index 8f7563fd6..a13b995f2 100644
--- a/addons/core/translations/form/en-us.yaml
+++ b/addons/core/translations/form/en-us.yaml
@@ -139,6 +139,7 @@ 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.
@@ -146,3 +147,7 @@ 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.
+  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.
\ 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 27e3497c0..29bd6c7a3 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -129,10 +129,15 @@ host-set:
         title: No Hosts Available
         description: No hosts available for selection.
   types:
-    static: Static
-    unknown: Unknown
-    aws: AWS
-    azure: Azure
+    static:
+      label: Static
+      help: Provide a list of hosts and host sets with static addresses
+    unknown:
+      label: Unknown
+    aws:
+      label: AWS
+    azure:
+      label: Azure
 host:
   title: Host
   title_plural: Hosts
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 110d1efd5..36ebed43a 100644
--- a/ui/admin/app/components/form/host-catalog/aws/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/aws/index.hbs
@@ -78,9 +78,7 @@
     </form.fieldset>
 
     <form.fieldset>
-      <:title>{{t
-          'form.provider.choose_a_provider.label'
-        }}</:title>
+      <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
       <:description>{{t
           'form.provider.choose_a_provider.description'
         }}</:description>
@@ -110,9 +108,7 @@
   {{else}}
     <form.fieldset>
       <:title>{{t 'form.provider.label'}}</:title>
-      <:description>{{t
-          'form.provider.description'
-        }}</:description>
+      <:description>{{t '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 8bab06be8..dc94e510d 100644
--- a/ui/admin/app/components/form/host-catalog/azure/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/azure/index.hbs
@@ -77,9 +77,7 @@
       <:title>{{t 'form.provider.label'}}</:title>
     </form.fieldset>
     <form.fieldset>
-      <:title>{{t
-          'form.provider.choose_a_provider.label'
-        }}</:title>
+      <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
       <:description>{{t
           'form.provider.choose_a_provider.description'
         }}</:description>
@@ -110,9 +108,7 @@
 
     <form.fieldset>
       <:title>{{t 'form.provider.label'}}</:title>
-      <:description>{{t
-          'form.provider.description'
-        }}</:description>
+      <:description>{{t 'form.provider.description'}}</:description>
 
       <:body>
         <form.radioGroup
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 5d637065c..f0d4c01d5 100644
--- a/ui/admin/app/components/form/host-catalog/static/index.hbs
+++ b/ui/admin/app/components/form/host-catalog/static/index.hbs
@@ -79,9 +79,7 @@
       </form.fieldset>
 
       <form.fieldset>
-        <:title>{{t
-            'form.provider.choose_a_provider.label'
-          }}</:title>
+        <:title>{{t 'form.provider.choose_a_provider.label'}}</:title>
         <:description>{{t
             'form.provider.choose_a_provider.description'
           }}</:description>
diff --git a/ui/admin/app/components/form/host-set/aws/index.hbs b/ui/admin/app/components/form/host-set/aws/index.hbs
new file mode 100644
index 000000000..f800e9d53
--- /dev/null
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -0,0 +1,93 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}}
+  as |form|
+>
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  <form.input
+    @value={{@model.type}}
+    @label={{t 'form.type.label'}}
+    readonly={{true}}
+    @disabled={{true}}
+  />
+
+  <form.fieldset>
+    <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+    <:description>{{t
+        'resources.host-catalog.form.provider.description'
+      }}</:description>
+
+    <:body>
+      <form.radioGroup
+        @name='provider'
+        @selectedValue={{@model.compositeType}}
+        @disabled={{true}}
+        as |radioGroup|
+      >
+        <radioGroup.card
+          @label={{t 'resources.host-set.types.aws.label'}}
+          @value={{@model.compositeType}}
+          @layout='tile'
+          @icon='flight-icons/svg/aws-color-16'
+        />
+      </form.radioGroup>
+    </: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>
+  </Rose::Form::Fieldset>
+
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-set/azure/index.hbs b/ui/admin/app/components/form/host-set/azure/index.hbs
new file mode 100644
index 000000000..340860893
--- /dev/null
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -0,0 +1,108 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}}
+  as |form|
+>
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  <form.input
+    @value={{@model.type}}
+    @label={{t 'form.type.label'}}
+    readonly={{true}}
+    @disabled={{true}}
+  />
+
+  <form.fieldset>
+    <:title>{{t 'resources.host-catalog.form.provider.label'}}</:title>
+    <:description>{{t
+        'resources.host-catalog.form.provider.description'
+      }}</:description>
+
+    <:body>
+      <form.radioGroup
+        @name='provider'
+        @selectedValue={{@model.compositeType}}
+        @disabled={{true}}
+        as |radioGroup|
+      >
+        <radioGroup.card
+          @label={{t 'resources.host-set.types.azure.label'}}
+          @value={{@model.compositeType}}
+          @layout='tile'
+          @icon='flight-icons/svg/azure-color-16'
+        />
+      </form.radioGroup>
+    </:body>
+  </form.fieldset>
+
+  {{! placeholder for filter, update me when the model is ready }}
+  <form.textarea
+    @name='filter'
+    @type='filter'
+    @label={{t 'form.provider.filter.label'}}
+    @helperText={{t 'form.provider.filter.help'}}
+    @linkText={{t 'form.provider.filter.link-text'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.filter}}
+      <field.errors as |errors|>
+        {{#each @model.errors.filter as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-set/index.hbs b/ui/admin/app/components/form/host-set/index.hbs
index 01864acc5..5c3bd3f0c 100644
--- a/ui/admin/app/components/form/host-set/index.hbs
+++ b/ui/admin/app/components/form/host-set/index.hbs
@@ -1,63 +1,6 @@
-<Rose::Form
-  @onSubmit={{@submit}}
-  @cancel={{@cancel}}
-  @disabled={{@model.isSaving}}
-  @error={{@model.errors.base}}
-  @showEditToggle={{if @model.isNew false true}}
-  as |form|
->
-
-  <form.input
-    @value={{@model.type}}
-    @label={{t 'form.type.label'}}
-    readonly={{true}}
-    @disabled={{true}}
-  />
-
-  <form.input
-    @name='name'
-    @type='name'
-    @value={{@model.name}}
-    @label={{t 'form.name.label'}}
-    @helperText={{t 'form.name.help'}}
-    @error={{@model.errors.name}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.name}}
-      <field.errors as |errors|>
-        {{#each @model.errors.name as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.input>
-
-  <form.textarea
-    @name='description'
-    @type='description'
-    @value={{@model.description}}
-    @label={{t 'form.description.label'}}
-    @helperText={{t 'form.description.help'}}
-    @error={{@model.errors.description}}
-    disabled={{@model.isSaving}}
-    readonly={{false}}
-    as |field|
-  >
-    {{#if @model.errors.description}}
-      <field.errors as |errors|>
-        {{#each @model.errors.description as |error|}}
-          <errors.message>{{error.message}}</errors.message>
-        {{/each}}
-      </field.errors>
-    {{/if}}
-  </form.textarea>
-  {{#if (can 'save model' @model)}}
-    <form.actions
-      @disabled={{if @model.cannotSave @model.cannotSave}}
-      @enableEditText={{t 'actions.edit-form'}}
-      @submitText={{t 'actions.save'}}
-      @cancelText={{t 'actions.cancel'}}
-    />
-  {{/if}}
-</Rose::Form>
\ No newline at end of file
+{{component
+  (concat 'form/host-set/' @model.compositeType)
+  model=@model
+  submit=@submit
+  cancel=@cancel
+}}
\ No newline at end of file
diff --git a/ui/admin/app/components/form/host-set/static/index.hbs b/ui/admin/app/components/form/host-set/static/index.hbs
new file mode 100644
index 000000000..7ed797846
--- /dev/null
+++ b/ui/admin/app/components/form/host-set/static/index.hbs
@@ -0,0 +1,57 @@
+<Rose::Form
+  @onSubmit={{@submit}}
+  @cancel={{@cancel}}
+  @disabled={{@model.isSaving}}
+  @error={{@model.errors.base}}
+  @showEditToggle={{if @model.isNew false true}}
+  as |form|
+>
+
+  <form.input
+    @name='name'
+    @type='name'
+    @value={{@model.name}}
+    @label={{t 'form.name.label'}}
+    @helperText={{t 'form.name.help'}}
+    @error={{@model.errors.name}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.name}}
+      <field.errors as |errors|>
+        {{#each @model.errors.name as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.input>
+
+  <form.textarea
+    @name='description'
+    @type='description'
+    @value={{@model.description}}
+    @label={{t 'form.description.label'}}
+    @helperText={{t 'form.description.help'}}
+    @error={{@model.errors.description}}
+    disabled={{@model.isSaving}}
+    readonly={{false}}
+    as |field|
+  >
+    {{#if @model.errors.description}}
+      <field.errors as |errors|>
+        {{#each @model.errors.description as |error|}}
+          <errors.message>{{error.message}}</errors.message>
+        {{/each}}
+      </field.errors>
+    {{/if}}
+  </form.textarea>
+
+  {{#if (can 'save model' @model)}}
+    <form.actions
+      @disabled={{if @model.cannotSave @model.cannotSave}}
+      @enableEditText={{t 'actions.edit-form'}}
+      @submitText={{t 'actions.save'}}
+      @cancelText={{t 'actions.cancel'}}
+    />
+  {{/if}}
+</Rose::Form>
\ No newline at end of file
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
index 3980cf51b..952e5d195 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/new.js
@@ -1,18 +1,26 @@
 import Route from '@ember/routing/route';
+import { action } from '@ember/object';
+import { inject as service } from '@ember/service';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsNewRoute extends Route {
-  // =methods
+  // =services
+  @service router;
 
+  // =methods
   /**
    * Creates a new unsaved host set in current host catalog scope.
    * @return {HostSetModel}
    */
   model() {
-    const { id: host_catalog_id } = this.modelFor(
+    const { id: host_catalog_id, compositeType } = this.modelFor(
       'scopes.scope.host-catalogs.host-catalog'
     );
+    if (this.currentModel?.isNew) {
+      this.currentModel.rollbackAttributes();
+    }
+    console.log('typedwed', compositeType);
     return this.store.createRecord('host-set', {
-      type: 'static',
+      compositeType,
       host_catalog_id,
     });
   }
@@ -47,4 +55,12 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsNewRoute extends
       model: model,
     });
   }
+  /**
+   * Update type of host set
+   * @param {string} type
+   */
+  @action
+  async changeType(type) {
+    await this.router.replaceWith({ queryParams: { type } });
+  }
 }
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
index 80ba8a4f8..9bcbe0fd4 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/hosts.hbs
@@ -8,7 +8,9 @@
         <row.headerCell>{{t 'form.name.label'}}</row.headerCell>
         <row.headerCell>{{t 'form.type.label'}}</row.headerCell>
         <row.headerCell>{{t 'form.id.label'}}</row.headerCell>
-        <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+        {{#if @model.isStatic}}
+          <row.headerCell>{{t 'titles.actions'}}</row.headerCell>
+        {{/if}}
       </header.row>
     </table.header>
     <table.body as |body|>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs
index d60d0cb30..50188d665 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs
@@ -27,7 +27,11 @@
           <row.cell>
             {{#if hostSet.isStatic}}
               <Rose::Badge>
-                {{t (concat 'resources.host-set.types.' hostSet.compositeType)}}
+                {{t
+                  (concat
+                    'resources.host-set.types.' hostSet.compositeType '.label'
+                  )
+                }}
               </Rose::Badge>
             {{else}}
               <Rose::Badge
@@ -37,7 +41,11 @@
                   '-color-16'
                 }}
               >
-                {{t (concat 'resources.host-set.types.' hostSet.compositeType)}}
+                {{t
+                  (concat
+                    'resources.host-set.types.' hostSet.compositeType '.label'
+                  )
+                }}
               </Rose::Badge>
             {{/if}}
           </row.cell>
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
index 9f68f1549..941f3e819 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/new.hbs
@@ -4,4 +4,5 @@
   @model={{@model}}
   @submit={{route-action 'save' @model}}
   @cancel={{route-action 'cancel' @model}}
+  @changeType={{route-action 'changeType' @model.type}}
 />
\ No newline at end of file