diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 1a7f5e761..a77e85c57 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -220,12 +220,6 @@ if str2bool(hiera('enable_telemetry', false)) {
   Cron <| title == 'ceilometer-expirer' |> { command =>
     "sleep $((\$(od -A n -t d -N 3 /dev/urandom) % 86400)) && ${::ceilometer::params::expirer_command}" }
 
-  # TODO: add support for setting these to puppet-ceilometer
-  ceilometer_config {
-    'hardware/readonly_user_name': value => hiera('snmpd_readonly_user_name');
-    'hardware/readonly_user_password': value => hiera('snmpd_readonly_user_password');
-  }
-
   # Aodh
   $aodh_dsn = split(hiera('aodh::db::database_connection'), '[@:/?]')
   class { '::aodh::db::mysql':
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 4eca3f78a..a6a11b498 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -288,8 +288,8 @@ ceilometer::keystone::authtoken::auth_url: "%{hiera('keystone_identity_uri')}"
 ceilometer::db::database_connection: mysql+pymysql://ceilometer:{{UNDERCLOUD_CEILOMETER_PASSWORD}}@{{LOCAL_IP}}/ceilometer
 ceilometer::agent::auth::auth_password: {{UNDERCLOUD_CEILOMETER_PASSWORD}}
 ceilometer_compute_agent: ''
-snmpd_readonly_user_name: {{UNDERCLOUD_CEILOMETER_SNMPD_USER}}
-snmpd_readonly_user_password: {{UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}}
+ceilometer::snmpd_readonly_username: {{UNDERCLOUD_CEILOMETER_SNMPD_USER}}
+ceilometer::snmpd_readonly_user_password: {{UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD}}
 ceilometer::keystone::auth::tenant: 'service'
 ceilometer::keystone::auth::public_url: {{UNDERCLOUD_ENDPOINT_CEILOMETER_PUBLIC}}
 ceilometer::keystone::auth::internal_url: {{UNDERCLOUD_ENDPOINT_CEILOMETER_INTERNAL}}