diff --git a/roles/overcloud-deploy/tasks/pre-deploy.yml b/roles/overcloud-deploy/tasks/pre-deploy.yml
index be0661b49..b4db5c958 100644
--- a/roles/overcloud-deploy/tasks/pre-deploy.yml
+++ b/roles/overcloud-deploy/tasks/pre-deploy.yml
@@ -122,7 +122,7 @@
   set_fact:
     ssl_overcloud_args: >-
       -e {{ working_dir }}/enable-tls.yaml
-      -e {{ overcloud_templates_path }}/environments/tls-endpoints-public-ip.yaml
+      -e {{ overcloud_templates_path }}/environments/ssl/tls-endpoints-public-ip.yaml
   when:
     - ssl_overcloud|bool
     - release not in ['mitaka', 'liberty']
@@ -152,8 +152,8 @@
   set_fact:
       tls_everywhere_args: >-
           -e {{ overcloud_templates_path }}/environments/services/haproxy-public-tls-certmonger.yaml
-          -e {{ overcloud_templates_path }}/environments/enable-internal-tls.yaml
-          -e {{ overcloud_templates_path }}/environments/tls-everywhere-endpoints-dns.yaml
+          -e {{ overcloud_templates_path }}/environments/ssl/enable-internal-tls.yaml
+          -e {{ overcloud_templates_path }}/environments/ssl/tls-everywhere-endpoints-dns.yaml
   when:
     - enable_tls_everywhere|bool
     - release not in ['mitaka', 'liberty', 'newton']
diff --git a/roles/overcloud-ssl/library/tls_tht.py b/roles/overcloud-ssl/library/tls_tht.py
index 31aa1bcd6..93dfc778b 100644
--- a/roles/overcloud-ssl/library/tls_tht.py
+++ b/roles/overcloud-ssl/library/tls_tht.py
@@ -74,7 +74,7 @@ def _open_yaml(filename):
 
 
 def create_enable_file(certpem, keypem, source_dir, dest_dir, tht_release):
-    output_dict = _open_yaml("{}environments/enable-tls.yaml".format(source_dir))
+    output_dict = _open_yaml("{}environments/ssl/enable-tls.yaml".format(source_dir))
 
     if tht_release == 'mitaka':
         for key in output_dict["parameter_defaults"]["EndpointMap"]: