diff --git a/instack_undercloud/tests/test_undercloud.py b/instack_undercloud/tests/test_undercloud.py
index b3eece8c7..d551ffa9e 100644
--- a/instack_undercloud/tests/test_undercloud.py
+++ b/instack_undercloud/tests/test_undercloud.py
@@ -589,7 +589,7 @@ class TestGenerateEnvironment(BaseTestCase):
         env = undercloud._generate_environment('.')
         endpoint_vars = {k: v for (k, v) in env.items()
                          if k.startswith('UNDERCLOUD_ENDPOINT')}
-        self.assertEqual(90, len(endpoint_vars))
+        self.assertEqual(96, len(endpoint_vars))
         # Spot check one service
         self.assertEqual('http://192.168.24.1:5000',
                          env['UNDERCLOUD_ENDPOINT_KEYSTONE_PUBLIC'])
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index 7fe242627..018c69d4e 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -962,6 +962,14 @@ def _generate_endpoints(instack_env):
             '%s://%s:%d/v2.1',
             {'host': public_host, 'port': 8774, 'ssl_port': 13774},
             {'host': internal_host, 'port': 8774}),
+        ('nova-ui-proxy',
+            '%s://%s:%d',
+            {'host': public_host, 'port': 8774, 'ssl_port': 13774},
+            {'host': internal_host, 'port': 8774}),
+        ('nova-ui-config',
+            '%s://%s:%d/nova/v2.1',
+            {'host': public_host, 'port': 3000, 'ssl_port': 443},
+            {'host': internal_host, 'port': 3000}),
         ('placement',
             '%s://%s:%d/placement',
             {'host': public_host, 'port': 8778, 'ssl_port': 13778},