diff --git a/addons/api/addon/generated/models/host.js b/addons/api/addon/generated/models/host.js
index 0d9e0dd2d..8713b9b89 100644
--- a/addons/api/addon/generated/models/host.js
+++ b/addons/api/addon/generated/models/host.js
@@ -35,8 +35,4 @@ export default class GeneratedHostModel extends BaseModel {
   })
   version;
 
-  @attr('string', {
-    description: 'The address (DNS or IP name) used to reach the host'
-  }) address;
-
 }
diff --git a/addons/api/addon/models/fragment-host-attributes.js b/addons/api/addon/models/fragment-host-attributes.js
new file mode 100644
index 000000000..114da4bca
--- /dev/null
+++ b/addons/api/addon/models/fragment-host-attributes.js
@@ -0,0 +1,9 @@
+import Fragment from 'ember-data-model-fragments/fragment';
+import { attr } from '@ember-data/model';
+
+export default class FragmentHostAttributesModel extends Fragment {
+
+  @attr('string', {
+    description: 'The address (DNS or IP name) used to reach the host'
+  }) address;
+}
diff --git a/addons/api/addon/models/host.js b/addons/api/addon/models/host.js
index 451097080..a2e855084 100644
--- a/addons/api/addon/models/host.js
+++ b/addons/api/addon/models/host.js
@@ -1,3 +1,12 @@
 import GeneratedHostModel from '../generated/models/host';
+import { fragment } from 'ember-data-model-fragments/attributes';
 
-export default class HostModel extends GeneratedHostModel {}
+export default class HostModel extends GeneratedHostModel {
+
+  /**
+   * Attributes of this resource, if any, represented as a JSON fragment.
+   * @type {FragmentHostAttributesModel}
+   */
+  @fragment('fragment-host-attributes', { defaultValue: {} }) attributes;
+
+}
diff --git a/addons/api/app/models/fragment-host-attributes.js b/addons/api/app/models/fragment-host-attributes.js
new file mode 100644
index 000000000..201efcb7a
--- /dev/null
+++ b/addons/api/app/models/fragment-host-attributes.js
@@ -0,0 +1 @@
+export { default } from 'api/models/fragment-host-attributes';
diff --git a/addons/api/tests/unit/models/host-test.js b/addons/api/tests/unit/models/host-test.js
index d19d98fc3..3cc0a3ad9 100644
--- a/addons/api/tests/unit/models/host-test.js
+++ b/addons/api/tests/unit/models/host-test.js
@@ -10,4 +10,15 @@ module('Unit | Model | host', function(hooks) {
     let model = store.createRecord('host', {});
     assert.ok(model);
   });
+
+  test('it contains attributes', function(assert) {
+    let store = this.owner.lookup('service:store');
+    let model = store.createRecord('host', {
+      type: 'static',
+      attributes: {
+        address: '127.0.0.1'
+      }
+    });
+    assert.equal(model.attributes.address, '127.0.0.1');
+  });
 });
diff --git a/ui/core/app/components/form/host-set/hosts/index.hbs b/ui/core/app/components/form/host-set/hosts/index.hbs
index 1943e26aa..088270a0b 100644
--- a/ui/core/app/components/form/host-set/hosts/index.hbs
+++ b/ui/core/app/components/form/host-set/hosts/index.hbs
@@ -41,7 +41,7 @@
               onChange={{fn @toggleHost option.host}} />
           </row.cell>
           <row.cell>{{option.host.name}}</row.cell>
-          <row.cell>{{option.host.address}}</row.cell>
+          <row.cell>{{option.host.attributes.address}}</row.cell>
         </body.row>
       {{/each}}
     </table.body>
diff --git a/ui/core/app/components/form/host/index.hbs b/ui/core/app/components/form/host/index.hbs
index 9152b0ba0..2168b7285 100644
--- a/ui/core/app/components/form/host/index.hbs
+++ b/ui/core/app/components/form/host/index.hbs
@@ -47,6 +47,24 @@
     {{/if}}
   </form.textarea>
 
+  <form.input
+    @name="address"
+    @type="text"
+    @value={{@model.attributes.address}}
+    @label={{t "form.label.address"}}
+    @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.actions
     @disabled={{if @model.cannotSave @model.cannotSave}}
     @submitText={{t "actions.save"}}
diff --git a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js
index 907454d36..87525e6c8 100644
--- a/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js
+++ b/ui/core/app/routes/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/host.js
@@ -13,6 +13,7 @@ export default class ScopesScopeProjectsProjectHostCatalogsHostCatalogHostsHostR
     const { id: scopeID } = this.modelFor('scopes.scope.projects.project');
     const hostCatalogID = this.modelFor('scopes.scope.projects.project.host-catalogs.host-catalog').id;
     return this.store.findRecord('host', host_id, {
+      reload: true,
       adapterOptions: { scopeID, hostCatalogID }
     });
   }
diff --git a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
index 034f2b9a1..2cac93ee4 100644
--- a/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
+++ b/ui/core/app/templates/scopes/scope/projects/project/host-catalogs/host-catalog/hosts/index.hbs
@@ -6,6 +6,7 @@
         <row.headerCell>{{t "form.label.name"}}</row.headerCell>
         <row.headerCell>{{t "form.label.type"}}</row.headerCell>
         <row.headerCell>{{t "form.label.id"}}</row.headerCell>
+        <row.headerCell>{{t "form.label.address"}}</row.headerCell>
       </header.row>
     </table.header>
     <table.body as |body|>
@@ -26,6 +27,9 @@
           <row.cell>
             <code>{{host.id}}</code>
           </row.cell>
+          <row.cell>
+            <code>{{host.attributes.address}}</code>
+          </row.cell>
         </body.row>
       {{/each}}
     </table.body>
diff --git a/ui/core/mirage/generated/factories/host.js b/ui/core/mirage/generated/factories/host.js
index 2d6925e82..e6fccf602 100644
--- a/ui/core/mirage/generated/factories/host.js
+++ b/ui/core/mirage/generated/factories/host.js
@@ -12,6 +12,6 @@ export default Factory.extend({
   created_time: () => date.recent(),
   updated_time: () => date.recent(),
   version: () => random.number(),
-  address: () => internet.ipv6(),
+  attributes: () => { return { address: internet.ipv6() } },
 
 });