diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 820249b..a598ee5 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -25,7 +25,6 @@
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
         ha_queues: true
-        rpc_thread_pool_size: 5
   nova:
     compute:
       notification:
diff --git a/ceilometer/server/backend/gnocchi.yml b/ceilometer/server/backend/gnocchi.yml
index e93eeaa..723d58c 100644
--- a/ceilometer/server/backend/gnocchi.yml
+++ b/ceilometer/server/backend/gnocchi.yml
@@ -17,6 +17,7 @@
           # filter_project is deprecated since queens
           filter_project: ${_param:ceilometer_gnocchi_filter_project}
           create_resources: ${_param:ceilometer_create_gnocchi_resources}
+          request_timeout: 30
         event_alarm_notifier:
           enabled: true
           url: "notifier://?topic=${_param:openstack_event_alarm_topic}"
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
diff --git a/gnocchi/server/cluster.yml b/gnocchi/server/cluster.yml
index 1d6e2c2..990fda2 100644
--- a/gnocchi/server/cluster.yml
+++ b/gnocchi/server/cluster.yml
@@ -12,6 +12,9 @@
   gnocchi:
     server:
       enable_proxy_headers_parsing: true
+      metricd:
+        metric_processing_delay: 15
+        metric_reporting_delay: 30
       identity:
         host: ${_param:openstack_control_address}
         region: ${_param:openstack_region}
diff --git a/gnocchi/server/single.yml b/gnocchi/server/single.yml
index 32555cb..d82dfee 100644
--- a/gnocchi/server/single.yml
+++ b/gnocchi/server/single.yml
@@ -4,4 +4,7 @@
   gnocchi:
     server:
       identity:
-        region: ${_param:openstack_region}
\ No newline at end of file
+        region: ${_param:openstack_region}
+      metricd:
+        metric_processing_delay: 15
+        metric_reporting_delay: 30