diff --git a/docker-compose.yml b/docker-compose.yml
index 03c4000..5e621d2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -79,9 +79,12 @@ services:
       - node.name=opensearch-node
       - discovery.type=single-node
       - bootstrap.memory_lock=false
-      - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "OPENSEARCH_JAVA_OPTS=-Xms256m -Xmx512m -XX:+UseG1GC"
       - "DISABLE_INSTALL_DEMO_CONFIG=true"
       - "DISABLE_SECURITY_PLUGIN=true"
+      - "DISABLE_PERFORMANCE_ANALYZER_AGENT_CLI=true"
+      - "logger.org.opensearch.transport=WARN"
+      - "logger.org.opensearch.cluster.service=WARN"
     ulimits:
       memlock:
         soft: -1
@@ -95,11 +98,11 @@ services:
       - storycove-network
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:9200/_cluster/health || exit 1"]
+      test: ["CMD-SHELL", "curl -s http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=5s || exit 1"]
       interval: 30s
       timeout: 10s
-      retries: 5
-      start_period: 60s
+      retries: 10
+      start_period: 120s
 
   opensearch-dashboards:
     image: opensearchproject/opensearch-dashboards:3.2.0