diff --git a/docker-compose.yml b/docker-compose.yml
index b50cf0e..959e54a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -83,16 +83,16 @@ services:
       - node.name=opensearch-node
       - discovery.type=single-node
       - bootstrap.memory_lock=false
-      - "OPENSEARCH_JAVA_OPTS=-Xms256m -Xmx512m -Dlog4j2.formatMsgNoLookups=true --add-opens=java.base/java.lang=ALL-UNNAMED"
+      - "OPENSEARCH_JAVA_OPTS=-Xms128m -Xmx256m -XX:+UseSerialGC -Djava.security.policy=all.policy"
       - "DISABLE_INSTALL_DEMO_CONFIG=true"
       - "DISABLE_SECURITY_PLUGIN=true"
       - "DISABLE_PERFORMANCE_ANALYZER_AGENT_CLI=true"
-      - "logger.root=INFO"
-      - "logger.org.opensearch=DEBUG"
-      - "action.destructive_requires_name=false"
-      - "OPENSEARCH_INITIAL_ADMIN_PASSWORD=admin123"
-      - "cluster.initial_cluster_manager_nodes=opensearch-node"
-      - "network.host=0.0.0.0"
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+        reservations:
+          memory: 256M
     ulimits:
       memlock:
         soft: -1
@@ -102,7 +102,18 @@ services:
         hard: 65536
     volumes:
       - opensearch_data:/usr/share/opensearch/data
-    user: "1000:1000"
+    command: >
+      bash -c "
+        echo 'Starting OpenSearch with debug output...'
+        echo 'Java version:'
+        java -version
+        echo 'Memory info:'
+        free -h
+        echo 'Disk space:'
+        df -h
+        echo 'Starting OpenSearch...'
+        exec /usr/share/opensearch/opensearch-docker-entrypoint.sh opensearch
+      "
     networks:
       - storycove-network
     restart: unless-stopped