diff --git a/docker/Dockerfile.staging b/docker/Dockerfile.staging
index b61a9d9b93..479458158d 100644
--- a/docker/Dockerfile.staging
+++ b/docker/Dockerfile.staging
@@ -45,7 +45,7 @@ COPY .mvn /.mvn
 COPY pom.xml /
 COPY --from=docs --chown=1001:0 /src /src
 COPY --from=docs --chown=1001:0 /target /target
-RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 compile war:exploded
+RUN ./mvnw -B -Dhttps.protocols=TLSv1.2 -DargLine="-Xms1024m -Xmx2048m -XX:MaxPermSize=512m" compile war:exploded
 
 #
 #
diff --git a/mvnw b/mvnw
index f8fa3c460b..41c0f0c23d 100755
--- a/mvnw
+++ b/mvnw
@@ -282,7 +282,7 @@ export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
 if [ "$MVNW_VERBOSE" = true ]; then
   echo $MAVEN_PROJECTBASEDIR
 fi
-MAVEN_OPTS="-Xms1g -Xmx2g"
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then