diff --git a/addons/api/addon/serializers/host-set.js b/addons/api/addon/serializers/host-set.js
index 613caf1ab..5749cd993 100644
--- a/addons/api/addon/serializers/host-set.js
+++ b/addons/api/addon/serializers/host-set.js
@@ -1,4 +1,5 @@
 import ApplicationSerializer from './application';
+import { copy } from 'ember-copy';
 
 const fieldByType = {
   aws: ['preferred_endpoints', 'filters'],
@@ -69,4 +70,19 @@ export default class HostSetSerializer extends ApplicationSerializer {
     }
     return value;
   }
+
+  /**
+   * Temporarily converts `filters` to an array if it is a string.  This is a
+   * quirk of the API.
+   *
+   * TODO:  remove once API consistently returns arrays.
+   */
+  normalize(typeClass, hash, ...rest) {
+    const normalizedHash = copy(hash, true);
+    if (typeof normalizedHash?.filters === 'string') {
+      normalizedHash.filters = [normalizedHash.filters];
+    }
+    const normalized = super.normalize(typeClass, normalizedHash, ...rest);
+    return normalized;
+  }
 }
diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml
index 1341dcc76..57de894d3 100644
--- a/addons/core/translations/resources/en-us.yaml
+++ b/addons/core/translations/resources/en-us.yaml
@@ -111,6 +111,9 @@ host-set:
     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
+    preferred_endpoints:
+      label: Preferred Endpoints
+      help: Selects addresses of hosts, in cidr:<valid IPv4/6 CIDR> or dns:<globbed name>  format
   messages:
     welcome:
       title: Welcome to Host Sets
diff --git a/addons/rose/addon/styles/rose/components/form/_input.scss b/addons/rose/addon/styles/rose/components/form/_input.scss
index 214f57734..889c933ef 100644
--- a/addons/rose/addon/styles/rose/components/form/_input.scss
+++ b/addons/rose/addon/styles/rose/components/form/_input.scss
@@ -30,6 +30,10 @@
   border-radius: sizing.rems(xxxs);
   box-shadow: inset 0px 3px 1px rgba(var(--stark-components), var(--opacity-4));
 
+  &::placeholder {
+    color: var(--ui-gray-subtler-1);
+  }
+
   &.error {
     color: var(--failure);
     border-color: currentColor;
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 3af6ce47f..3d7b974ab 100644
--- a/ui/admin/app/components/form/host-set/aws/index.hbs
+++ b/ui/admin/app/components/form/host-set/aws/index.hbs
@@ -74,6 +74,94 @@
     </:body>
   </form.fieldset>
 
+  <Rose::Form::Fieldset>
+    <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}}</:title>
+    <:description>{{t
+        'resources.host-set.form.preferred_endpoints.help'
+      }}</:description>
+    <:body>
+      {{#if @model.errors.preferred_endpoints}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.preferred_endpoints 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.preferred_endpoints as |endpoint i|}}
+            <body.row as |row|>
+              <row.cell>
+                <form.input
+                  @type='text'
+                  @value={{endpoint.value}}
+                  @error={{@model.errors.preferred_endpoints}}
+                  @contextual={{true}}
+                  placeholder='cidr:2001:4860:4860::8888/32'
+                  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 'preferred_endpoints' i)}}
+                >
+                  {{t 'actions.remove'}}
+                </Rose::Button>
+              </row.cell>
+            </body.row>
+          {{/each}}
+
+          <body.row as |row|>
+            <row.cell>
+              <form.input
+                @type='text'
+                @value={{@model.preferred_endpoint}}
+                placeholder='cidr:2001:4860:4860::8888/32'
+              />
+            </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
+                    'preferred_endpoints'
+                    @model.preferred_endpoint
+                  )
+                }}
+              >
+                {{t 'actions.add'}}
+              </Rose::Button>
+            </row.cell>
+          </body.row>
+        </table.body>
+      </Rose::Table>
+    </:body>
+  </Rose::Form::Fieldset>
+
   <Rose::Form::Fieldset>
     <:title>{{t 'resources.host-set.form.filter.label'}}</:title>
     <:description>{{t 'resources.host-set.form.filter.help'}}</:description>
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 686cb70d4..866577b7d 100644
--- a/ui/admin/app/components/form/host-set/azure/index.hbs
+++ b/ui/admin/app/components/form/host-set/azure/index.hbs
@@ -74,6 +74,94 @@
     </:body>
   </form.fieldset>
 
+  <Rose::Form::Fieldset>
+    <:title>{{t 'resources.host-set.form.preferred_endpoints.label'}}</:title>
+    <:description>{{t
+        'resources.host-set.form.preferred_endpoints.help'
+      }}</:description>
+    <:body>
+      {{#if @model.errors.preferred_endpoints}}
+        <Rose::Form::Errors as |errors|>
+          {{#each @model.errors.preferred_endpoints 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.preferred_endpoints as |endpoint i|}}
+            <body.row as |row|>
+              <row.cell>
+                <form.input
+                  @type='text'
+                  @value={{endpoint.value}}
+                  @error={{@model.errors.preferred_endpoints}}
+                  @contextual={{true}}
+                  placeholder='cidr:2001:4860:4860::8888/32'
+                  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 'preferred_endpoints' i)}}
+                >
+                  {{t 'actions.remove'}}
+                </Rose::Button>
+              </row.cell>
+            </body.row>
+          {{/each}}
+
+          <body.row as |row|>
+            <row.cell>
+              <form.input
+                @type='text'
+                @value={{@model.preferred_endpoint}}
+                placeholder='cidr:2001:4860:4860::8888/32'
+              />
+            </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
+                    'preferred_endpoints'
+                    @model.preferred_endpoint
+                  )
+                }}
+              >
+                {{t 'actions.add'}}
+              </Rose::Button>
+            </row.cell>
+          </body.row>
+        </table.body>
+      </Rose::Table>
+    </:body>
+  </Rose::Form::Fieldset>
+
   <form.textarea
     @name='filter'
     @type='filter'