diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 218cb4879..275d6c279 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -216,6 +216,8 @@ conf:
       cephx_require_signatures: false
       cephx_cluster_require_signatures: true
       cephx_service_require_signatures: false
+      objecter_inflight_op_bytes: "1073741824"
+      objecter_inflight_ops: 10240
     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 5ad9b462d..7ba269d7d 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -162,12 +162,28 @@ conf:
       cephx_require_signatures: false
       cephx_cluster_require_signatures: true
       cephx_service_require_signatures: false
+      objecter_inflight_op_bytes: "1073741824"
+      objecter_inflight_ops: 10240
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048
       osd_max_object_name_len: 256
       ms_bind_port_min: 6800
       ms_bind_port_max: 7100
+      osd_snap_trim_priority: 1
+      filestore_merge_threshold: -50
+      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_chunk_min: 1
+      osd_scrub_chunk_max: 4
+      osd_deep_scrub_stride: "1048576"
+      osd_scrub_priority: 1
+      osd_recovery_op_priority: 1
+      osd_recovery_max_active: 1
+      osd_mount_options_xfs: "rw,noatime,largeio,inode64,swalloc,logbufs=8,logbsize=256k,allocsize=4M"
   storage:
     mon:
       directory: /var/lib/openstack-helm/ceph/mon
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index c40dd43dc..8505c3cbf 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -88,12 +88,29 @@ conf:
       cephx_require_signatures: false
       cephx_cluster_require_signatures: true
       cephx_service_require_signatures: false
+      objecter_inflight_op_bytes: "1073741824"
+      objecter_inflight_ops: 10240
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048
       osd_max_object_name_len: 256
       ms_bind_port_min: 6800
       ms_bind_port_max: 7100
+      osd_snap_trim_priority: 1
+      filestore_merge_threshold: "-50"
+      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_chunk_min: 1
+      osd_scrub_chunk_max: 4
+      osd_deep_scrub_stride: "1048576"
+      osd_scrub_priority: 1
+      osd_recovery_op_priority: 1
+      osd_recovery_max_active: 1
+      osd_mount_options_xfs: "rw,noatime,largeio,inode64,swalloc,logbufs=8,logbsize=256k,allocsize=4M"
+
   storage:
     # NOTE(portdirect): for homogeneous clusters the `osd` key can be used to
     # define OSD pods that will be deployed across the cluster.
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index b5eb3c34f..77d9064f9 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -107,6 +107,8 @@ conf:
       cephx_require_signatures: false
       cephx_cluster_require_signatures: true
       cephx_service_require_signatures: false
+      objecter_inflight_op_bytes: "1073741824"
+      objecter_inflight_ops: 10240
     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 de6be5581..f39080958 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -278,6 +278,8 @@ conf:
       rgw_swift_url: null
       #NOTE (portdirect): See http://tracker.ceph.com/issues/21226
       rgw_keystone_token_cache_size: 0
+      #NOTE (JCL): See http://tracker.ceph.com/issues/7073
+      rgw_gc_max_objs: 997
   rgw_s3:
     enabled: false
     admin_caps: "users=*;buckets=*;zone=*"
@@ -288,6 +290,8 @@ conf:
       cephx_require_signatures: false
       cephx_cluster_require_signatures: true
       cephx_service_require_signatures: false
+      objecter_inflight_op_bytes: "1073741824"
+      objecter_inflight_ops: 10240
     osd:
       osd_mkfs_type: xfs
       osd_mkfs_options_xfs: -f -i size=2048