diff --git a/devstack/settings b/devstack/settings
index 61dcc07..2c1bae2 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -15,7 +15,7 @@ CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
 CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
 
 # Auth info
-OS_AUTH_URL="$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION"
+OS_AUTH_URL="$KEYSTONE_SERVICE_URI/v$IDENTITY_API_VERSION"
 OS_IDENTITY_API_VERSION=${IDENTITY_API_VERSION:-3}
 
 # Fall back to default conf dir if option is unset
diff --git a/releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml b/releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml
new file mode 100644
index 0000000..c098c4a
--- /dev/null
+++ b/releasenotes/notes/bug-1656063-00b08d0cb6e3def8.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Fixes 'bug 1656063 https://bugs.launchpad.net/collectd-ceilometer-plugin/+bug/1656063'.
+    OS_AUTH_URL now uses KEYSTONE_AUTH_URI instead of KEYSTONE_SERVICE_URI.
+    Previously, the URL needed to be changed after deployment because the admin
+    url was being used for Keystone, instead of the public url used for
+    obtainining auth tokens. There's no longer a need to adjust the
+    configuration file after deployment.