diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 6ed4688..9024435 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -26,7 +26,7 @@ function configure_ceilosca {
 
     iniset $CEILOMETER_CONF database metering_connection monasca://$MONASCA_API_URL
     iniset $CEILOMETER_CONF notification workers $API_WORKERS
-    iniset $CEILOMETER_CONF notifications workload_partitioning False
+    iniset $CEILOMETER_CONF notification workload_partitioning False
     # Disable, otherwise Ceilosca won't process and store event data
     iniset $CEILOMETER_CONF notification disable_non_metric_meters False
 
diff --git a/etc/ceilometer/ceilometer.conf b/etc/ceilometer/ceilometer.conf
index 1065dc7..a84dca9 100644
--- a/etc/ceilometer/ceilometer.conf
+++ b/etc/ceilometer/ceilometer.conf
@@ -1,17 +1,18 @@
+# Example ceilometer.conf file provided by monasca-ceilometer
+# Note: Devstack install of ceilometer and ceilosca will not use this file.
+#       Rather, monasca-ceilometer/devstack/plugin.sh will replace certain
+#       properties in the /etc/ceilometer/ceilometer.conf created by the
+#       ceilometer installation.
+# If you choose to use this file, be sure to replace the IPs and passwords to
+# match your deployment.
 
 [DEFAULT]
-collector_workers = 1
-notification_workers = 3
-policy_file = /etc/ceilometer/policy.json
-debug = False
-verbose = False
-notification_topics = notifications
-rpc_backend = rabbit
+debug = false
+verbose = false
+transport_url = rabbit://stackrabbit:password@16.78.179.83:5672//
 
-[oslo_messaging_rabbit]
-rabbit_userid = stackrabbit
-rabbit_password = password
-rabbit_hosts = 16.78.179.83
+[oslo_messaging_notifications]
+topics = notifications
 
 [service_credentials]
 auth_url = http://192.168.10.6:5000/v3
@@ -24,30 +25,14 @@ user_domain_id = default
 auth_type = password
 interface = internalURL
 
-[keystone_authtoken]
-auth_type = v3password
-cafile = /opt/stack/data/ca-bundle.pem
-auth_uri = http://16.78.179.83:5000
-project_domain_id = default
-project_name = service
-user_domain_id = default
-project_domain_name = Default
-user_domain_name = Default
-password = password
-username = ceilometer
-auth_url = http://16.78.179.83:35357
-auth_plugin = password
-region_name = RegionOne
-
 [notification]
-store_events = True
-disable_non_metric_meters = False
+workers = 3
 
+# Note: database section removed after Pike from Ceilometer
 [database]
-#metering_connection = mysql://root:password@127.0.0.1/ceilometer?charset=utf8
-event_connection = mysql://root:password@127.0.0.1/ceilometer?charset=utf8
-alarm_connection = mysql://root:password@127.0.0.1/ceilometer?charset=utf8
+# metering_connection = mysql://root:password@127.0.0.1/ceilometer?charset=utf8
 connection = monasca://http://127.0.0.1:8070/v2.0
+metering_time_to_live = -1
 
 [monasca]
 enable_api_pagination = True