diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index f39996f2a..8599b46c7 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -293,6 +293,7 @@ conf:
       #NOTE (supamatt): Increase threads and rados handles for better performance
       rgw_thread_pool_size: 512
       rgw_num_rados_handles: 4
+      rgw_override_bucket_index_max_shards: 8
   rgw_s3:
     enabled: false
     admin_caps: "users=*;buckets=*;zone=*"