diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index 0c194b0b8..593ad1c7a 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -24,5 +24,5 @@ do
     CLASSPATH="$i:$CLASSPATH"
 done
 
-exec java ${JAVA_OPTS} -classpath $CLASSPATH \
- org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"
+exec java  -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \
+     ${JAVA_OPTS} -classpath $CLASSPATH org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"
diff --git a/docker/ui/docker-entrypoint.sh b/docker/ui/docker-entrypoint.sh
index a94d0eceb..ef30a59fa 100755
--- a/docker/ui/docker-entrypoint.sh
+++ b/docker/ui/docker-entrypoint.sh
@@ -18,4 +18,5 @@
 
 set -ex
 
-exec java -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"
+exec java -XX:+PrintFlagsFinal -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap \ 
+    -jar webapp/skywalking-webapp.jar --logging.config=webapp/logback.xml "$@"