diff --git a/addons/core/translations/en-us.yaml b/addons/core/translations/en-us.yaml
index 73a720d62..12232d8a6 100644
--- a/addons/core/translations/en-us.yaml
+++ b/addons/core/translations/en-us.yaml
@@ -30,6 +30,7 @@ titles:
   label: Label
   value: Value
   no-results: No Results
+  ip-addresses: Latest IP Addresses
 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
diff --git a/ui/admin/app/components/form/host/aws/index.hbs b/ui/admin/app/components/form/host/aws/index.hbs
index 8e6a2cc08..1ceea8ff7 100644
--- a/ui/admin/app/components/form/host/aws/index.hbs
+++ b/ui/admin/app/components/form/host/aws/index.hbs
@@ -71,13 +71,18 @@
       </form.radioGroup>
     </:body>
   </form.fieldset>
+
   {{#each @model.ip_addresses as |ip_address|}}
-    <form.input
-      @value={{ip_address}}
-      @label={{t 'form.type.address'}}
-      readonly={{true}}
-      @disabled={{true}}
-    />
+    <form.fieldset>
+      <:title>{{t 'titles.ip-addresses'}}</:title>
+      <:body>
+        <form.input
+          @value={{ip_address}}
+          readonly={{true}}
+          @disabled={{true}}
+        />
+      </:body>
+    </form.fieldset>
   {{/each}}
   {{#if (can 'save model' @model)}}
     <form.actions
diff --git a/ui/admin/app/components/form/host/azure/index.hbs b/ui/admin/app/components/form/host/azure/index.hbs
index 5bec7fadd..321f94223 100644
--- a/ui/admin/app/components/form/host/azure/index.hbs
+++ b/ui/admin/app/components/form/host/azure/index.hbs
@@ -71,14 +71,21 @@
       </form.radioGroup>
     </:body>
   </form.fieldset>
-  {{#each @model.ip_addresses as |ip_address|}}
-    <form.input
-      @value={{ip_address}}
-      @label={{t 'form.type.address'}}
-      readonly={{true}}
-      @disabled={{true}}
-    />
-  {{/each}}
+
+  <form.fieldset>
+    <:title>{{t 'titles.ip-addresses'}}</:title>
+    <:body>
+      {{#each @model.ip_addresses as |ip_address|}}
+
+        <form.input
+          @value={{ip_address}}
+          readonly={{true}}
+          @disabled={{true}}
+        />
+      {{/each}}
+    </:body>
+  </form.fieldset>
+
   {{#if (can 'save model' @model)}}
     <form.actions
       @disabled={{if @model.cannotSave @model.cannotSave}}