diff --git a/tripleoclient/tests/v1/undercloud/test_undercloud.py b/tripleoclient/tests/v1/undercloud/test_undercloud.py
index 18912b0c2..a83dac425 100644
--- a/tripleoclient/tests/v1/undercloud/test_undercloud.py
+++ b/tripleoclient/tests/v1/undercloud/test_undercloud.py
@@ -84,7 +84,7 @@ class TestUndercloudInstall(TestPluginV1):
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'tls-endpoints-public-ip.yaml', '-e',
+             'ssl/tls-endpoints-public-ip.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'use-dns-for-vips.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -133,7 +133,7 @@ class TestUndercloudInstall(TestPluginV1):
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'tls-endpoints-public-ip.yaml', '-e',
+             'ssl/tls-endpoints-public-ip.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'use-dns-for-vips.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -184,7 +184,7 @@ class TestUndercloudInstall(TestPluginV1):
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'tls-endpoints-public-ip.yaml', '-e',
+             'ssl/tls-endpoints-public-ip.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'use-dns-for-vips.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -265,7 +265,7 @@ class TestUndercloudUpgrade(TestPluginV1):
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'tls-endpoints-public-ip.yaml', '-e',
+             'ssl/tls-endpoints-public-ip.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'use-dns-for-vips.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
@@ -317,7 +317,7 @@ class TestUndercloudUpgrade(TestPluginV1):
              '--public-virtual-ip', '192.168.24.2',
              '--control-virtual-ip', '192.168.24.3', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
-             'tls-endpoints-public-ip.yaml', '-e',
+             'ssl/tls-endpoints-public-ip.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
              'use-dns-for-vips.yaml', '-e',
              '/usr/share/openstack-tripleo-heat-templates/environments/'
diff --git a/tripleoclient/tests/v1/undercloud/test_undercloud_config.py b/tripleoclient/tests/v1/undercloud/test_undercloud_config.py
index 8bf0c4415..3f35bd9f5 100644
--- a/tripleoclient/tests/v1/undercloud/test_undercloud_config.py
+++ b/tripleoclient/tests/v1/undercloud/test_undercloud_config.py
@@ -108,7 +108,7 @@ class TestTLSSettings(base.TestCase):
     def test_public_host_with_ip_should_give_ip_endpoint_environment(self):
         expected_env_file = os.path.join(
             undercloud_config.THT_HOME,
-            "environments/tls-endpoints-public-ip.yaml")
+            "environments/ssl/tls-endpoints-public-ip.yaml")
 
         resulting_env_file1 = undercloud_config._get_tls_endpoint_environment(
             '127.0.0.1', undercloud_config.THT_HOME)
@@ -123,7 +123,7 @@ class TestTLSSettings(base.TestCase):
     def test_public_host_with_fqdn_should_give_dns_endpoint_environment(self):
         expected_env_file = os.path.join(
             undercloud_config.THT_HOME,
-            "environments/tls-endpoints-public-dns.yaml")
+            "environments/ssl/tls-endpoints-public-dns.yaml")
 
         resulting_env_file1 = undercloud_config._get_tls_endpoint_environment(
             'controller-1', undercloud_config.THT_HOME)
diff --git a/tripleoclient/v1/undercloud_config.py b/tripleoclient/v1/undercloud_config.py
index 28d3da2b1..86e603e3e 100644
--- a/tripleoclient/v1/undercloud_config.py
+++ b/tripleoclient/v1/undercloud_config.py
@@ -831,10 +831,10 @@ def _get_tls_endpoint_environment(public_host, tht_templates):
     try:
         netaddr.IPAddress(public_host)
         return os.path.join(tht_templates,
-                            "environments/tls-endpoints-public-ip.yaml")
+                            "environments/ssl/tls-endpoints-public-ip.yaml")
     except netaddr.core.AddrFormatError:
         return os.path.join(tht_templates,
-                            "environments/tls-endpoints-public-dns.yaml")
+                            "environments/ssl/tls-endpoints-public-dns.yaml")
 
 
 def _get_public_tls_parameters(service_certificate_path):