diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0-mysql/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0-mysql/Dockerfile
index c6de3b1ed..ed4920411 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0-mysql/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0-mysql/Dockerfile
@@ -14,4 +14,4 @@ RUN set -x \
     && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \
     && apk del build-dependencies
 
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0/Dockerfile
index ee78981a2..50fb73c65 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0/Dockerfile
@@ -22,4 +22,4 @@ RUN set -x \
 VOLUME "$HAWKBIT_HOME/data"
 
 WORKDIR $HAWKBIT_HOME
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/Dockerfile
index 8110dbb8d..9d89b7a6a 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4-mysql/Dockerfile
@@ -13,4 +13,4 @@ RUN set -x \
     && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \
     && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar
 
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=amqp,mysql","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=amqp,mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4/Dockerfile
index 8070bd579..9dd3accaf 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M4/Dockerfile
@@ -23,4 +23,4 @@ RUN set -x \
 VOLUME "$HAWKBIT_HOME/data"
 
 WORKDIR $HAWKBIT_HOME
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile
index 26c3ab14a..e407cf69f 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9-mysql/Dockerfile
@@ -14,4 +14,4 @@ RUN set -x \
     && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \
     && apk del build-dependencies
 
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile
index 032702520..e8e5c789b 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.0M9/Dockerfile
@@ -22,4 +22,4 @@ RUN set -x \
 VOLUME "$HAWKBIT_HOME/data"
 
 WORKDIR $HAWKBIT_HOME
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.1-mysql/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.1-mysql/Dockerfile
index ce27cc488..d9423518a 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.1-mysql/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.1-mysql/Dockerfile
@@ -12,4 +12,4 @@ RUN set -x \
     && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \
     && apk del build-dependencies
 
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
diff --git a/hawkbit-runtime/hawkbit-update-server/docker/0.2.1/Dockerfile b/hawkbit-runtime/hawkbit-update-server/docker/0.2.1/Dockerfile
index 1bf6c5876..5b4e1175f 100644
--- a/hawkbit-runtime/hawkbit-update-server/docker/0.2.1/Dockerfile
+++ b/hawkbit-runtime/hawkbit-update-server/docker/0.2.1/Dockerfile
@@ -20,4 +20,4 @@ RUN set -x \
 VOLUME "$HAWKBIT_HOME/data"
 
 WORKDIR $HAWKBIT_HOME
-ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xmx768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]
+ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"]