diff --git a/docker-compose.yml b/docker-compose.yml
index 9b18aa0f78d997fc40456ab8ba960ae0a547d706..ebab3fc2443aca8f1aebfa908c268da4515e0f8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,16 @@
 version: '3.3'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.13.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6
     container_name: elasticsearch-faidare
     environment:
       - discovery.type=single-node
-      - "ES_JAVA_OPTS=-Dlog4j2.formatMsgNoLookups=true"
+      - "ES_JAVA_OPTS=-Dlog4j2.formatMsgNoLookups=true -Xms2g -Xmx2g -XX:ParallelGCThreads=2"
     ports:
       - 9200:9200
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.13.2
+    image: docker.elastic.co/kibana/kibana:7.17.6
     container_name: kibana-faidare
     environment:
       - "ELASTICSEARCH_URL=http://elasticsearch:9200"
diff --git a/scripts/harvest.sh b/scripts/harvest.sh
index 564d94ad1ba36f7878fbabecc72d910deaab06f9..471d00793269ceea951f667f6522eb8f3f80315a 100755
--- a/scripts/harvest.sh
+++ b/scripts/harvest.sh
@@ -249,6 +249,18 @@ for DOCUMENT_TYPE in ${DOCUMENT_TYPES}; do
 		check_acknowledgment "${LOG}" "create aliase"
 	done
 
+	if [ "$ENV" == "prod" ]; then
+		echo ; echo "Update replica setting: ${INDEX_PATTERN}-*"
+		LOG=$(curl -s -X PUT "${ES_HOST}:${ES_PORT}/${INDEX_PATTERN}-*/_settings?pretty" -H 'Content-Type: application/json' -d"
+			{
+				\"index\" : {
+					\"number_of_replicas\" : 1
+				}
+			}
+		")
+		check_acknowledgment "${LOG}" "updating replicas setting for pattern ${INDEX_PATTERN}-*"
+	fi
+
 	# Delete all but last created indices (thanks to the timestamp suffix)
 	echo -e "* Delete old indices ${INDEX_PATTERN} (to avoid accumulation over time):"
 	OLD_INDICES=$(curl -sf -XGET "${ES_HOST}:${ES_PORT}/_cat/indices/${INDEX_PATTERN}*?h=index" | sort | head -n -1)