diff --git a/devstack/lib/rally b/devstack/lib/rally
index 843f8004..e2c03c58 100644
--- a/devstack/lib/rally
+++ b/devstack/lib/rally
@@ -52,7 +52,7 @@ then
     "type": "ExistingCloud",
     "creds": {
         "openstack": {
-            "auth_url": "$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION",
+            "auth_url": "$OS_AUTH_URL",
             "region_name": "$REGION_NAME",
             "admin": {
                 "username": "admin",
@@ -71,7 +71,7 @@ then
     "type": "ExistingCloud",
     "creds": {
         "openstack": {
-            "auth_url": "$KEYSTONE_AUTH_URI_V3",
+            "auth_url": "$OS_AUTH_URL",
             "region_name": "$REGION_NAME",
             "admin": {
                 "username": "admin",