diff --git a/server/apps/server-app/Dockerfile b/server/apps/server-app/Dockerfile
index e7cf434d38..8b18d6c220 100644
--- a/server/apps/server-app/Dockerfile
+++ b/server/apps/server-app/Dockerfile
@@ -1,10 +1,8 @@
 # docker/dockerfile:1
-FROM ghcr.io/graalvm/graalvm-community:21.0.2  AS bytechef-base
+FROM ghcr.io/graalvm/graalvm-community:21.0.2  AS bytechef-server-base
 
 ARG ARG_APPLICATION_HOME=/opt/bytechef
 
-ENV ENV_JVM_MEMORY_OPTS="-Xms1G -Xmx2G"
-
 RUN mkdir ${ARG_APPLICATION_HOME}
 RUN mkdir ${ARG_APPLICATION_HOME}/server
 RUN mkdir ${ARG_APPLICATION_HOME}/server/tmp
@@ -19,7 +17,7 @@ ENTRYPOINT exec \
      -Dfile.encoding=UTF-8 -Duser.timezone=GMT \
      -Djava.io.tmpdir=/opt/bytechef/server/tmp \
      -Dserver.tomcat.basedir=/opt/bytechef/server \
-     -Dserver.tomcat.accesslog.directory=/opt/bytechef/server/logs${ENV_JVM_MEMORY_OPTS:+ $ENV_JVM_MEMORY_OPTS} \
+     -Dserver.tomcat.accesslog.directory=/opt/bytechef/server/logs \
      -jar server/server-app.jar
 
-FROM bytechef-base AS bytechef-server
+FROM bytechef-server-base AS bytechef-server