diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index d9d78e6..19336b0 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -12,6 +12,9 @@
       cluster: true
       secret: ${_param:ceilometer_secret_key}
       ttl: 86400
+      notification:
+        workload_partitioning: true
+        batch_timeout: 30
       publisher:
         default: {}
       bind:
@@ -34,5 +37,3 @@
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
-        # Workaround for https://bugs.launchpad.net/ceilometer/+bug/1337715
-        rpc_thread_pool_size: 5