diff --git a/glance/registry/client/v1/api.py b/glance/registry/client/v1/api.py
index 21ad154a69..347c970dc1 100644
--- a/glance/registry/client/v1/api.py
+++ b/glance/registry/client/v1/api.py
@@ -114,7 +114,7 @@ def configure_registry_admin_creds():
         'password': CONF.admin_password,
         'username': CONF.admin_user,
         'tenant': CONF.admin_tenant_name,
-        'auth_url': CONF.auth_url,
+        'auth_url': os.getenv('OS_AUTH_URL') or CONF.auth_url,
         'strategy': strategy,
         'region': CONF.auth_region,
     }
diff --git a/glance/registry/client/v2/api.py b/glance/registry/client/v2/api.py
index 9d3854fd49..69b136af7a 100644
--- a/glance/registry/client/v2/api.py
+++ b/glance/registry/client/v2/api.py
@@ -95,7 +95,7 @@ def configure_registry_admin_creds():
         'password': CONF.admin_password,
         'username': CONF.admin_user,
         'tenant': CONF.admin_tenant_name,
-        'auth_url': CONF.auth_url,
+        'auth_url': os.getenv('OS_AUTH_URL') or CONF.auth_url,
         'strategy': strategy,
         'region': CONF.auth_region,
     }