diff --git a/docker/images/pinot/Dockerfile b/docker/images/pinot/Dockerfile
index ce54bbdb452f..413cd2a934b0 100644
--- a/docker/images/pinot/Dockerfile
+++ b/docker/images/pinot/Dockerfile
@@ -65,6 +65,7 @@ FROM openjdk:${JAVA_VERSION}-jdk-slim
 LABEL MAINTAINER=dev@pinot.apache.org
 
 ENV PINOT_HOME=/opt/pinot
+ENV JAVA_OPTS="-Xms4G -Xmx4G -Dpinot.admin.system.exit=false"
 
 VOLUME ["${PINOT_HOME}/configs", "${PINOT_HOME}/data"]