diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index a2a68a5a1f..d4d758edd7 100644
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -77,6 +77,7 @@ parameters:
       ZaqarApiNetwork: internal_api
       DockerRegistryNetwork: ctlplane
       PacemakerRemoteNetwork: internal_api
+      TripleoUINetwork: internal_api
       # We special-case the default ResolveNetwork for the CephStorage role
       # for backwards compatibility, all other roles default to internal_api
       CephStorageHostnameResolveNetwork: storage
diff --git a/puppet/services/tripleo-ui.yaml b/puppet/services/tripleo-ui.yaml
index 3aabb92f8a..091e1470be 100644
--- a/puppet/services/tripleo-ui.yaml
+++ b/puppet/services/tripleo-ui.yaml
@@ -80,10 +80,12 @@ outputs:
             tripleo::ui::endpoint_config_mistral: {get_param: [EndpointMap, MistralUIConfig, uri]}
             tripleo::ui::endpoint_config_nova: {get_param: [EndpointMap, NovaUIConfig, uri]}
             tripleo::ui::endpoint_config_swift: {get_param: [EndpointMap, SwiftUIConfig, uri]}
-            # FIXME(mandre) we're required to set bind_host otherwise it
-            # complains that it can't find the controller_host hiera key
-            tripleo::ui::bind_host: "127.0.0.1"
-
+            tripleo::ui::bind_host:
+              str_replace:
+                template:
+                  "%{hiera('$NETWORK')}"
+                params:
+                  $NETWORK: {get_param: [ServiceNetMap, TripleoUINetwork]}
       step_config: |
         include ::tripleo::ui
       service_config_settings: {}