diff --git a/cli/pom.xml b/cli/pom.xml
index 257f878..78699c3 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -38,7 +38,7 @@
                         <image>
                             <name>${docker.name.windup.cli}</name>
                             <build>
-                                <from>registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.8</from>
+                                <from>registry.access.redhat.com/ubi8/openjdk-11:1.11</from>
                                 <cmd>/opt/migrationtoolkit/bin/mta-cli</cmd>
                                 <assembly>
                                     <targetDir>/</targetDir>
diff --git a/messaging-executor/pom.xml b/messaging-executor/pom.xml
index 33fe7e8..f388dd4 100644
--- a/messaging-executor/pom.xml
+++ b/messaging-executor/pom.xml
@@ -37,7 +37,7 @@
                         <image>
                             <name>${docker.name.windup.web.executor}</name>
                             <build>
-                                <from>registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift:1.8</from>
+                                <from>registry.access.redhat.com/ubi8/openjdk-11:1.11</from>
                                 <cmd>/opt/mta-cli/bin/openshift-launch.sh</cmd>
                                 <assembly>
                                     <targetDir>/</targetDir>
diff --git a/messaging-executor/src/main/resources/bin/mta-cli b/messaging-executor/src/main/resources/bin/mta-cli
index e9a23d7..79f1c71 100755
--- a/messaging-executor/src/main/resources/bin/mta-cli
+++ b/messaging-executor/src/main/resources/bin/mta-cli
@@ -191,9 +191,11 @@ fi
 
 JAVAVER=`"$JAVACMD" -version 2>&1`
 case $JAVAVER in
-*1.[8-9]*) ;;
-*1.[1-7]*)
-	echo " Error: a Java 1.8 or higher JRE is required to run MTA; found [$JAVACMD -version == $JAVAVER]."
+*"11"*)
+  MODULES="--add-modules=java.se"
+ ;;
+*)
+	echo " Error: a Java 11 JRE is required to run MTA; found [$JAVACMD -version == $JAVAVER]."
 	exit 1
  ;;
 esac
@@ -240,5 +242,5 @@ MTA_OPTS="$MTA_OPTS $FILE_DESCRIPTOR_OPTS";
 
 JAVA_TOOL_OPTIONS=""
 
-$JAVACMD "${MTA_DEBUG_ARGS[@]}" $MTA_OPTS -Dforge.standalone=true -Dforge.home=${MTA_HOME} -Dwindup.home=${MTA_HOME} \
+$JAVACMD "${MTA_DEBUG_ARGS[@]}" $MTA_OPTS -Dforge.standalone=true -Dforge.home=${MTA_HOME} -Dwindup.home=${MTA_HOME} -Djboss.modules.system.pkgs=sun.reflect \
    -cp ${MTA_HOME}/lib/'*' $MTA_MAIN_CLASS "${QUOTED_ARGS[@]}" "${ADDONS_DIR[@]}"
diff --git a/web/pom.xml b/web/pom.xml
index 5afc066..51178a2 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -37,7 +37,7 @@
                         <image>
                             <name>${docker.name.windup.web}</name>
                             <build>
-                                <from>registry.redhat.io/jboss-eap-7/eap73-openjdk8-openshift-rhel7:7.3.0-13</from>
+                                <from>registry.redhat.io/jboss-eap-7/eap73-openjdk11-openshift-rhel8:7.3.0</from>
                                 <cmd>/opt/eap/bin/webapp-launch.sh</cmd>
                                 <assembly>
                                     <targetDir>/</targetDir>