diff --git a/.env b/.env
index c925caa..09ba744 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,8 @@
 # Java options
-POWERAUTH_JAVA_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -Xmx750m
+POWERAUTH_JAVA_OPTS=-Xmx450m
 
 # Memory settings
-JAVA_PROCESS_MEMORY_LIMIT=786432000
+JAVA_PROCESS_MEMORY_LIMIT=524288000
 
 # Configuration for PostgreSQL database related to PowerAuth Server
 POWERAUTH_POSTGRESQL_PATH=/var/lib/powerauth/postgresql-pas
diff --git a/docker-powerauth-data-adapter/Dockerfile b/docker-powerauth-data-adapter/Dockerfile
index 8d2390f..0e8a542 100644
--- a/docker-powerauth-data-adapter/Dockerfile
+++ b/docker-powerauth-data-adapter/Dockerfile
@@ -1,8 +1,8 @@
-FROM tomcat:9-jdk11
+FROM tomcat:jdk11-adoptopenjdk-openj9
 LABEL maintainer="petr@wultra.com"
 
 # Prepare environment variables
-ENV JAVA_HOME /usr/local/openjdk-11
+ENV JAVA_HOME /opt/java/openjdk
 ENV TOMCAT_HOME /usr/local/tomcat
 
 # Clear root context
diff --git a/docker-powerauth-nextstep/Dockerfile b/docker-powerauth-nextstep/Dockerfile
index 91ca0f0..e6f77fc 100644
--- a/docker-powerauth-nextstep/Dockerfile
+++ b/docker-powerauth-nextstep/Dockerfile
@@ -1,8 +1,8 @@
-FROM tomcat:9-jdk11
+FROM tomcat:jdk11-adoptopenjdk-openj9
 LABEL maintainer="petr@wultra.com"
 
 # Prepare environment variables
-ENV JAVA_HOME /usr/local/openjdk-11
+ENV JAVA_HOME /opt/java/openjdk
 ENV TOMCAT_HOME /usr/local/tomcat
 
 # Clear root context
diff --git a/docker-powerauth-push-server/Dockerfile b/docker-powerauth-push-server/Dockerfile
index 9736c91..de449e2 100644
--- a/docker-powerauth-push-server/Dockerfile
+++ b/docker-powerauth-push-server/Dockerfile
@@ -1,8 +1,8 @@
-FROM tomcat:9-jdk11
+FROM tomcat:jdk11-adoptopenjdk-openj9
 LABEL maintainer="petr@wultra.com"
 
 # Prepare environment variables
-ENV JAVA_HOME /usr/local/openjdk-11
+ENV JAVA_HOME /opt/java/openjdk
 ENV TOMCAT_HOME /usr/local/tomcat
 
 # Clear root context
diff --git a/docker-powerauth-server/Dockerfile b/docker-powerauth-server/Dockerfile
index 259463d..6b206ee 100644
--- a/docker-powerauth-server/Dockerfile
+++ b/docker-powerauth-server/Dockerfile
@@ -1,8 +1,8 @@
-FROM tomcat:9-jdk11
+FROM tomcat:jdk11-adoptopenjdk-openj9
 LABEL maintainer="petr@wultra.com"
 
 # Prepare environment variables
-ENV JAVA_HOME /usr/local/openjdk-11
+ENV JAVA_HOME /opt/java/openjdk
 ENV TOMCAT_HOME /usr/local/tomcat
 
 # Clear root context
diff --git a/docker-powerauth-tpp-engine/Dockerfile b/docker-powerauth-tpp-engine/Dockerfile
index 2964d6b..93e372e 100644
--- a/docker-powerauth-tpp-engine/Dockerfile
+++ b/docker-powerauth-tpp-engine/Dockerfile
@@ -1,8 +1,8 @@
-FROM tomcat:9-jdk11
+FROM tomcat:jdk11-adoptopenjdk-openj9
 LABEL maintainer="petr@wultra.com"
 
 # Prepare environment variables
-ENV JAVA_HOME /usr/local/openjdk-11
+ENV JAVA_HOME /opt/java/openjdk
 ENV TOMCAT_HOME /usr/local/tomcat
 
 # Clear root context
diff --git a/docker-powerauth-webflow/Dockerfile b/docker-powerauth-webflow/Dockerfile
index 54e6e4e..bb0f883 100644
--- a/docker-powerauth-webflow/Dockerfile
+++ b/docker-powerauth-webflow/Dockerfile
@@ -1,8 +1,8 @@
-FROM tomcat:9-jdk11
+FROM tomcat:jdk11-adoptopenjdk-openj9
 LABEL maintainer="petr@wultra.com"
 
 # Prepare environment variables
-ENV JAVA_HOME /usr/local/openjdk-11
+ENV JAVA_HOME /opt/java/openjdk
 ENV TOMCAT_HOME /usr/local/tomcat
 ENV WEBFLOW_RESOURCES /opt/ext-resources