diff --git a/addons/api/addon/generated/models/host-catalog.js b/addons/api/addon/generated/models/host-catalog.js
index 0591352e2..660711a70 100644
--- a/addons/api/addon/generated/models/host-catalog.js
+++ b/addons/api/addon/generated/models/host-catalog.js
@@ -39,11 +39,6 @@ export default class GeneratedHostCatalogModel extends BaseModel {
   })
   disabled;
 
-  @attr({
-    description: 'Attributes specific to the catalog type',
-  })
-  attributes;
-
   @attr('number', {
     description: 'Current version number of this resource.',
   })
diff --git a/addons/api/addon/serializers/application.js b/addons/api/addon/serializers/application.js
index dcc33eff6..8f519e8e2 100644
--- a/addons/api/addon/serializers/application.js
+++ b/addons/api/addon/serializers/application.js
@@ -234,11 +234,13 @@ export default class ApplicationSerializer extends RESTSerializer {
    */
   normalizeNestedAttributes(typeClass, hash) {
     typeClass.attributes.forEach((attribute) => {
-      const { isNestedAttribute } = attribute.options;
-      const attributeValue = hash.attributes?.[attribute.name];
-      if (isNestedAttribute && typeof attributeValue != 'undefined') {
-        hash[attribute.name] = attributeValue;
-      }
+      const {
+        name,
+        options: { isNestedAttribute },
+      } = attribute;
+      const value = hash.attributes?.[name];
+      const isUndefined = value === undefined;
+      if (isNestedAttribute && !isUndefined) hash[name] = value;
     });
     return hash;
   }
@@ -261,15 +263,8 @@ export default class ApplicationSerializer extends RESTSerializer {
         name,
         options: { isNestedSecret },
       } = attribute;
-      const attributeValue = hash.secrets?.[name];
-
-      // FIXME: This could be improved
-      if (isNestedSecret) {
-        hash[name] = null;
-        if (typeof attributeValue != 'undefined') {
-          hash[name] = attributeValue;
-        }
-      }
+      const value = hash.secrets?.[name];
+      if (isNestedSecret) hash[name] = value || null;
     });
     return hash;
   }
diff --git a/addons/api/addon/serializers/host-catalog.js b/addons/api/addon/serializers/host-catalog.js
index f5d1cd983..77c78c680 100644
--- a/addons/api/addon/serializers/host-catalog.js
+++ b/addons/api/addon/serializers/host-catalog.js
@@ -1,5 +1,4 @@
 import ApplicationSerializer from './application';
-import { copy } from 'ember-copy';
 
 const fieldsByType = {
   aws: [
@@ -57,11 +56,4 @@ export default class HostCatalogSerializer extends ApplicationSerializer {
     delete serialized.secrets;
     return serialized;
   }
-
-  normalize(typeClass, hash, ...rest) {
-    let normalizedHash = copy(hash, true);
-    const normalized = super.normalize(typeClass, normalizedHash, ...rest);
-    delete normalized.data.attributes.attributes;
-    return normalized;
-  }
 }
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 d61cdc0de..f090e2d18 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -78,6 +78,75 @@
   <Rose::Form::Fieldset>
     <:title>{{t 'form.provider.filter.label'}}</:title>
     <:description>{{t 'form.provider.filter.help'}}</:description>
+    <:body>
+      {{#if @model.errors.filters}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.filters as |error|}}
+            <errors.message>{{error.message}}</errors.message>
+          {{/each}}
+        </Rose::Form::Errors>
+      {{/if}}
+      <Rose::Table @style='condensed' as |table|>
+        <table.header as |header|>
+          <header.row @hidden={{true}} as |row|>
+            <row.headerCell>{{t 'titles.value'}}</row.headerCell>
+            <row.headerCell />
+          </header.row>
+        </table.header>
+        <table.body as |body|>
+          {{#each @model.filters as |filter i|}}
+            <body.row as |row|>
+              <row.cell>
+                <form.input
+                  @type='text'
+                  @value={{filter.value}}
+                  @error={{@model.errors.filters}}
+                  @contextual={{true}}
+                  as |field|
+                >
+                  <field.field />
+                </form.input>
+              </row.cell>
+              <row.cell @shrink={{true}}>
+                <Rose::Button
+                  @style='warning'
+                  @iconOnly='flight-icons/svg/trash-16'
+                  title={{t 'actions.remove'}}
+                  @disabled={{if
+                    @model.isNew
+                    false
+                    (if form.isEditable false true)
+                  }}
+                  {{on 'click' (fn @removeItemByIndex 'filters' i)}}
+                >
+                  {{t 'actions.remove'}}
+                </Rose::Button>
+              </row.cell>
+            </body.row>
+          {{/each}}
+
+          <body.row as |row|>
+            <row.cell>
+              <form.input @type='text' @value={{@model.filter}} />
+            </row.cell>
+            <row.cell @shrink={{true}}>
+              <Rose::Button
+                @style='secondary'
+                title={{t 'actions.add'}}
+                @disabled={{if
+                  @model.isNew
+                  false
+                  (if form.isEditable false true)
+                }}
+                {{on 'click' (fn @addStringItem 'filters' @model.filter)}}
+              >
+                {{t 'actions.add'}}
+              </Rose::Button>
+            </row.cell>
+          </body.row>
+        </table.body>
+      </Rose::Table>
+    </:body>
   </Rose::Form::Fieldset>
 
   {{#if (can 'save model' @model)}}
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 9150d5e7f..8abc0724d 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -78,6 +78,7 @@
   <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'}}
diff --git a/ui/admin/app/components/form/host-set/index.hbs b/ui/admin/app/components/form/host-set/index.hbs
index 5c3bd3f0c..55f9de05a 100644
--- a/ui/admin/app/components/form/host-set/index.hbs
+++ b/ui/admin/app/components/form/host-set/index.hbs
@@ -3,4 +3,6 @@
   model=@model
   submit=@submit
   cancel=@cancel
+  removeItemByIndex=@removeItemByIndex
+  addStringItem=@addStringItem
 }}
\ No newline at end of file
diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
index 31339c0dc..5ffb8cf76 100644
--- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
+++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/host-set.js
@@ -1,4 +1,5 @@
 import Route from '@ember/routing/route';
+import { action } from '@ember/object';
 
 export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetRoute extends Route {
   // =methods
@@ -49,4 +50,30 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsHostSetRoute exte
       }
     );
   }
+
+  /**
+   * Adds a string item to array `property` on the passed `filter`.
+   
+   * @param {hostSetModel} hostSet
+   * @param {string} property
+   * @param {string} value
+   */
+  @action
+  async addStringItem(hostSet, property, value) {
+    const array = hostSet.get(property);
+    array.addObject({ value });
+  }
+
+  /**
+   * Removes an item from array `property` at `index` on the
+   * passed `hostSet`.
+   * @param {hostSetModel} hostSet
+   * @param {string} property
+   * @param {number} index
+   */
+  @action
+  async removeItemByIndex(hostSet, property, index) {
+    const array = hostSet.get(property);
+    array.removeAt(index);
+  }
 }
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 952e5d195..38b1c86c6 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
@@ -63,4 +63,28 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsNewRoute extends
   async changeType(type) {
     await this.router.replaceWith({ queryParams: { type } });
   }
+  /**
+   * Adds a string item to array `property` on the passed `filter`.
+   
+   * @param {hostSetModel} hostSet
+   * @param {string} property
+   * @param {string} value
+   */
+  @action
+  async addStringItem(hostSet, property, value) {
+    const array = hostSet.get(property);
+    array.addObject({ value });
+  }
+  /**
+   * Removes an item from array `property` at `index` on the
+   * passed `hostSet`.
+   * @param {hostSetModel} hostSet
+   * @param {string} property
+   * @param {number} index
+   */
+  @action
+  async removeItemByIndex(hostSet, property, index) {
+    const array = hostSet.get(property);
+    array.removeAt(index);
+  }
 }
diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs
index 36a777f60..724c55573 100644
--- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/host-set/index.hbs
@@ -2,4 +2,6 @@
   @model={{@model}}
   @submit={{route-action 'save' @model}}
   @cancel={{route-action 'cancel' @model}}
+  @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
+  @addStringItem={{route-action 'addStringItem' @model}}
 />
\ No newline at end of file
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 941f3e819..4047f364c 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
@@ -5,4 +5,6 @@
   @submit={{route-action 'save' @model}}
   @cancel={{route-action 'cancel' @model}}
   @changeType={{route-action 'changeType' @model.type}}
+  @removeItemByIndex={{route-action 'removeItemByIndex' @model}}
+  @addStringItem={{route-action 'addStringItem' @model}}
 />
\ No newline at end of file