diff --git a/devstack/libs/collectd b/devstack/libs/collectd
index 4cd2e43..720b8bd 100644
--- a/devstack/libs/collectd
+++ b/devstack/libs/collectd
@@ -64,9 +64,9 @@ cat << EOF | sudo tee $COLLECTD_CONF_DIR/collectd-ceilometer-plugin.conf
         CEILOMETER_TIMEOUT "$CEILOMETER_TIMEOUT"
 
         # # Ceilometer user creds
-        OS_USERNAME "$OS_USERNAME"
-        OS_PASSWORD "$OS_PASSWORD"
-        OS_TENANT_NAME "service"
+        OS_USERNAME "ceilometer"
+        OS_PASSWORD "$SERVICE_PASSWORD"
+        OS_TENANT_NAME "$SERVICE_TENANT_NAME"
 
     </Module>
 </Plugin>
diff --git a/devstack/settings b/devstack/settings
index 382b1e6..068677c 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -16,8 +16,6 @@ CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
 
 # Auth info
 OS_AUTH_URL="$KEYSTONE_AUTH_URI/v$IDENTITY_API_VERSION"
-OS_USERNAME="ceilometer"
-OS_PASSWORD=${SERVICE_PASSWORD}
 
 # Fall back to default conf dir if option is unset
 if [ -z $COLLECTD_CONF_DIR ]; then