diff --git a/dist-material/bin/oapService.sh b/dist-material/bin/oapService.sh
index 876043b020..8eb33a21bd 100644
--- a/dist-material/bin/oapService.sh
+++ b/dist-material/bin/oapService.sh
@@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
 [ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
 
 OAP_LOG_DIR="${OAP_LOG_DIR:-${OAP_HOME}/logs}"
-JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx512M}"
+JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx4096M}"
 
 if [ ! -d "${OAP_LOG_DIR}" ]; then
     mkdir -p "${OAP_LOG_DIR}"
diff --git a/dist-material/bin/oapServiceInit.sh b/dist-material/bin/oapServiceInit.sh
index 66a63b8c23..38ca0bb738 100644
--- a/dist-material/bin/oapServiceInit.sh
+++ b/dist-material/bin/oapServiceInit.sh
@@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
 [ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
 
 OAP_LOG_DIR="${OAP_HOME}/logs"
-JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx512M}"
+JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx4096M}"
 
 if [ ! -d "${OAP_HOME}/logs" ]; then
     mkdir -p "${OAP_LOG_DIR}"
diff --git a/dist-material/bin/oapServiceNoInit.sh b/dist-material/bin/oapServiceNoInit.sh
index 7573192ee1..58134ec990 100644
--- a/dist-material/bin/oapServiceNoInit.sh
+++ b/dist-material/bin/oapServiceNoInit.sh
@@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
 [ -z "$OAP_HOME" ] && OAP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
 
 OAP_LOG_DIR=${OAP_LOG_DIR:-"${OAP_HOME}/logs"}
-JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx512M}"
+JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx4096M}"
 
 if [ ! -d "${OAP_HOME}/logs" ]; then
     mkdir -p "${OAP_LOG_DIR}"
diff --git a/dist-material/bin/webappService.sh b/dist-material/bin/webappService.sh
index f157f7399a..a07a7b72a9 100644
--- a/dist-material/bin/webappService.sh
+++ b/dist-material/bin/webappService.sh
@@ -20,7 +20,7 @@ PRGDIR=$(dirname "$PRG")
 [ -z "$WEBAPP_HOME" ] && WEBAPP_HOME=$(cd "$PRGDIR/.." > /dev/null || exit 1; pwd)
 
 WEBAPP_LOG_DIR="${WEBAPP_LOG_DIR:-${WEBAPP_HOME}/logs}"
-JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx512M} -Dwebapp.logDir=${WEBAPP_LOG_DIR}"
+JAVA_OPTS="${JAVA_OPTS:-  -Xms256M -Xmx1024M} -Dwebapp.logDir=${WEBAPP_LOG_DIR}"
 JAR_PATH="${WEBAPP_HOME}/webapp"
 
 if [ ! -d "${WEBAPP_LOG_DIR}" ]; then
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index b217764402..8aff8e73f7 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -44,6 +44,7 @@
   but in #10616, an empty array is returned.
 * Cache all service entity in memory for query.
 * Bump up jackson version to 2.15.2.
+* Increase the default memory size to avoid OOM.
 
 #### UI