diff --git a/CloudronManifest.json b/CloudronManifest.json
index 0480033..40401c9 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -12,7 +12,6 @@
      "mysql": {},
      "ldap": {}
   },
-  "memoryLimit": 2048,
   "manifestVersion": 1,
   "website": "http://guacamole.incubator.apache.org/",
   "contactEmail": "support@cloudron.io",
diff --git a/Dockerfile b/Dockerfile
index 6f1f21d..22d0d48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -56,7 +56,6 @@ RUN ln -s /run/tomcat/temp /usr/share/tomcat8/temp \
     && ln -s /run/tomcat/webapps /usr/share/tomcat8/webapps
     
 ENV GUACAMOLE_HOME /app/code
-ENV JAVA_OPTS "-Djava.awt.headless=true -server -Xmx512M -Djava.security.egd=file:/dev/urandom"
 
 ADD start.sh /app/code/start.sh
 
diff --git a/start.sh b/start.sh
index 9e63296..cb4498f 100755
--- a/start.sh
+++ b/start.sh
@@ -30,4 +30,6 @@ $MYSQL < /app/code/schema/001-create-schema.sql \
 
 /app/code/sbin/guacd
 
+export JAVA_OPTS="-Djava.awt.headless=true -XX:MaxRAM=256M -Djava.security.egd=file:/dev/urandom"
+
 exec /usr/share/tomcat8/bin/catalina.sh run