diff --git a/software-client/software_client/software_client.py b/software-client/software_client/software_client.py
index 7ecef158..8f8abe7d 100644
--- a/software-client/software_client/software_client.py
+++ b/software-client/software_client/software_client.py
@@ -371,10 +371,6 @@ class SoftwareClientShell(object):
             rc = 1
             exit(rc)
 
-        endpoint_type = 'public'
-        if dc_request:
-            endpoint_type = 'internal'
-
         # Identify authentication mode [token, keystone, local_root]
         if args.software_url and args.os_auth_token:
             auth_mode = TOKEN
@@ -390,7 +386,6 @@ class SoftwareClientShell(object):
                              'software commands as root (sudo)')
             raise exc.CommandError(exception_msg)
 
-        args.os_endpoint_type = endpoint_type
         client = sclient.get_client(api_version, auth_mode, **(args.__dict__))
 
         try:
diff --git a/software/scripts/upgrade_utils.py b/software/scripts/upgrade_utils.py
index 947f71e6..79682e90 100644
--- a/software/scripts/upgrade_utils.py
+++ b/software/scripts/upgrade_utils.py
@@ -48,7 +48,7 @@ def get_token_endpoint(config, service_type="platform"):
         token = sess.get_token()
         endpoint = sess.get_endpoint(service_type=service_type,
                                      region_name=config["region_name"],
-                                     interface="public")
+                                     interface='internal')
     except exceptions.http.Unauthorized:
         raise Exception("Failed to authenticate to Keystone. Request unauthorized")
     except Exception as e:
diff --git a/software/software/utils.py b/software/software/utils.py
index c25f7a64..6c55ab7e 100644
--- a/software/software/utils.py
+++ b/software/software/utils.py
@@ -420,7 +420,7 @@ def get_endpoints_token(config=None, service_type="platform"):
         token, endpoint = get_auth_token_and_endpoint(user=user,
                                                       service_type=service_type,
                                                       region_name=region_name,
-                                                      interface='public')
+                                                      interface='internal')
         return token, endpoint
     except Exception as e:
         LOG.error("Failed to get '%s' endpoint. Error: %s", service_type, str(e))