diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index abd0b780d..5047dd003 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -421,11 +421,6 @@ class DeployOvercloud(command.Command):
             try:
                 keystone_client.services.find(name=service)
             except kscexc.NotFound:
-                if not tls_enabled:
-                    # NOTE(bcrochet): Bad hack. Remove the ssl_port info from
-                    # the os_cloud_config.SERVICES dictionary
-                    data.pop('ssl_port', None)
-
                 service_data = self._set_service_data(service, data, stack)
                 if service_data:
                     services.update({service: service_data})
@@ -458,6 +453,12 @@ class DeployOvercloud(command.Command):
                 admin_port=admin_port,
                 internal_port=internal_port)
 
+            if not tls_enabled:
+                # NOTE(bcrochet): Bad hack. Remove the ssl_port info from the
+                # os_cloud_config.SERVICES dictionary
+                for service_name, data in keystone.SERVICES.items():
+                    data.pop('ssl_port', None)
+
             keystone.setup_endpoints(
                 services,
                 client=keystone_client,