Limit memory usage
diff --git a/docker/maven-build/build.sh b/docker/maven-build/build.sh
index b4f5767..2917391 100755
--- a/docker/maven-build/build.sh
+++ b/docker/maven-build/build.sh
@@ -6,10 +6,11 @@
 # trace commands
 set -x
 
-# Temporary workaround with Surefire on Debian with Java 8
+# Temporary workaround with Surefire on Debian with Java 8 and limit memory usage
 # https://issues.apache.org/jira/browse/SUREFIRE-1588
 # https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class
-export _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+export MAVEN_OPTS="-Xmx1024m"
+export _JAVA_OPTIONS="-Djdk.net.URLClassPath.disableClassPathURLCheck=true -Xmx1024m"
 
 mvn -V clean install
 
diff --git a/docker/studio-build/Dockerfile b/docker/studio-build/Dockerfile
index e4ca737..07c4212 100644
--- a/docker/studio-build/Dockerfile
+++ b/docker/studio-build/Dockerfile
@@ -26,8 +26,8 @@
 RUN apt-get install -y --no-install-recommends krb5-config krb5-user
 
 # Create home directory
-RUN mkdir /home/hnelson && chmod 777 /home/hnelson
-WORKDIR /home/hnelson
+RUN mkdir -p /home/hnelson/studio && chmod 777 /home/hnelson && chmod 777 /home/hnelson/studio
+WORKDIR /home/hnelson/studio
 
 # Add krb5.conf with EXAMPLE.COM domain
 ADD krb5.conf /etc/
diff --git a/docker/studio-build/build-studio-with-ui-tests.sh b/docker/studio-build/build-studio-with-ui-tests.sh
index a0f0b8f..4a30818 100755
--- a/docker/studio-build/build-studio-with-ui-tests.sh
+++ b/docker/studio-build/build-studio-with-ui-tests.sh
@@ -6,12 +6,12 @@
 # trace commands
 set -x
 
-# Temporary workaround with Surefire on Debian with Java 8
+# Temporary workaround with Surefire on Debian with Java 8 and limit memory usage
 # https://issues.apache.org/jira/browse/SUREFIRE-1588
 # https://stackoverflow.com/questions/53010200/maven-surefire-could-not-find-forkedbooter-class
-export _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+export MAVEN_OPTS="-Xmx1024m"
+export _JAVA_OPTIONS="-Djdk.net.URLClassPath.disableClassPathURLCheck=true -Xmx1024m"
 
-cd /home/hnelson/studio
 mvn -V -f pom-first.xml clean install
 mvn -V clean install -Denable-ui-tests