diff --git a/docker/kafka-setup/kafka-setup.sh b/docker/kafka-setup/kafka-setup.sh
index e6dcf6e199..d8cc4a251c 100755
--- a/docker/kafka-setup/kafka-setup.sh
+++ b/docker/kafka-setup/kafka-setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-: ${PARTITIONS:=1}
+: ${PARTITIONS:=6}
 : ${REPLICATION_FACTOR:=1}
 
 : ${KAFKA_PROPERTIES_SECURITY_PROTOCOL:=PLAINTEXT}
diff --git a/metadata-service/factories/src/main/resources/application.yml b/metadata-service/factories/src/main/resources/application.yml
index e136a18602..901c185e56 100644
--- a/metadata-service/factories/src/main/resources/application.yml
+++ b/metadata-service/factories/src/main/resources/application.yml
@@ -147,7 +147,7 @@ elasticsearch:
     retryInterval: ${ES_BULK_RETRY_INTERVAL:1}
   index:
     prefix: ${INDEX_PREFIX:}
-    numShards: ${ELASTICSEARCH_NUM_SHARDS_PER_INDEX:1}
+    numShards: ${ELASTICSEARCH_NUM_SHARDS_PER_INDEX:6}
     numReplicas: ${ELASTICSEARCH_NUM_REPLICAS_PER_INDEX:1}
     numRetries: ${ELASTICSEARCH_INDEX_BUILDER_NUM_RETRIES:3}
     maxArrayLength: ${SEARCH_DOCUMENT_MAX_ARRAY_LENGTH:1000}