diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html
index b60d510..13d907c 100644
--- a/app/overview/controllers/system-overview-controller.html
+++ b/app/overview/controllers/system-overview-controller.html
@@ -46,17 +46,22 @@
                 {{ dataService.hostname }}
               </dd>
             </dl>
-            <dl class="list-pair">
-              <dt>IP addresses</dt>
-              <dd class="courier-bold" ng-repeat="ip_address in bmc_ip_addresses">
-                {{ ip_address }}
+            <dl class="list-pair" ng-repeat="(ifaceName,iface) in dataService.network_interfaces">
+              <dt>{{ifaceName | uppercase}} IP addresses</dt>
+              <dd class="courier-bold" ng-repeat="ipv4 in iface.ipv4.values">
+                IPv4: <span>{{ ipv4.Address }}</span>
+              </dd>
+              <dd class="courier-bold" ng-repeat="ipv6 in iface.ipv6.values">
+                IPv6: <span>{{ ipv6.Address | uppercase }}</span>
               </dd>
             </dl>
           </div>
           <div class="column large-6">
-            <dl class="list-pair">
-              <dt>Mac address</dt>
-              <dd class="courier-bold">{{ dataService.mac_address }}</dd>
+            <dl class="list-pair" ng-repeat="(ifaceName,iface) in dataService.network_interfaces">
+              <dt>{{ifaceName | uppercase}} Mac address</dt>
+              <dd>
+                <span>{{iface.MACAddress | uppercase}}</span>
+              </dd>
             </dl>
             <dl class="list-pair">
               <dt>Firmware Version</dt>
@@ -224,4 +229,4 @@
     </div>
   </div>
 </section>
-<div class="modal-overlay" tabindex="-1" ng-class="{'active': edit_hostname}"></div>
\ No newline at end of file
+<div class="modal-overlay" tabindex="-1" ng-class="{'active': edit_hostname}"></div>