diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index f330c2bd5..ff26aef3d 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -219,6 +219,7 @@ conf:
       cephx_service_require_signatures: false
       objecter_inflight_op_bytes: "1073741824"
       objecter_inflight_ops: 10240
+      debug_ms: "0/0"
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index b41e27ec4..7e92f0983 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -156,6 +156,7 @@ conf:
       cephx_service_require_signatures: false
       objecter_inflight_op_bytes: "1073741824"
       objecter_inflight_ops: 10240
+      debug_ms: "0/0"
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048
@@ -163,7 +164,9 @@ conf:
       ms_bind_port_min: 6800
       ms_bind_port_max: 7100
       osd_snap_trim_priority: 1
-      filestore_merge_threshold: -50
+      osd_snap_trim_sleep: 0.1
+      osd_pg_max_concurrent_snap_trims: 1
+      filestore_merge_threshold: -10
       filestore_split_multiple: 12
       osd_scrub_begin_hour: 22
       osd_scrub_end_hour: 4
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index ba5886e50..c0c78cfe3 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -82,6 +82,7 @@ conf:
       cephx_service_require_signatures: false
       objecter_inflight_op_bytes: "1073741824"
       objecter_inflight_ops: 10240
+      debug_ms: "0/0"
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048
@@ -89,12 +90,14 @@ conf:
       ms_bind_port_min: 6800
       ms_bind_port_max: 7100
       osd_snap_trim_priority: 1
-      filestore_merge_threshold: "-50"
+      osd_snap_trim_sleep: 0.1
+      osd_pg_max_concurrent_snap_trims: 1
+      filestore_merge_threshold: -10
       filestore_split_multiple: 12
       osd_scrub_begin_hour: 22
       osd_scrub_end_hour: 4
       osd_scrub_during_recovery: false
-      osd_scrub_sleep: "0.1"
+      osd_scrub_sleep: 0.1
       osd_scrub_chunk_min: 1
       osd_scrub_chunk_max: 4
       osd_deep_scrub_stride: "1048576"
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index 77d9064f9..574a0ec6d 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -109,6 +109,7 @@ conf:
       cephx_service_require_signatures: false
       objecter_inflight_op_bytes: "1073741824"
       objecter_inflight_ops: 10240
+      debug_ms: "0/0"
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index ec394b0b9..020cca141 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -283,6 +283,7 @@ conf:
       #NOTE (JCL): See http://tracker.ceph.com/issues/24937
       #NOTE (JCL): See https://tracker.ceph.com/issues/24551
       rgw_dynamic_resharding: false
+      rgw_thread_pool_size: 512
   rgw_s3:
     enabled: false
     admin_caps: "users=*;buckets=*;zone=*"
@@ -295,6 +296,7 @@ conf:
       cephx_service_require_signatures: false
       objecter_inflight_op_bytes: "1073741824"
       objecter_inflight_ops: 10240
+      debug_ms: "0/0"
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048