diff --git a/Jenkinsfile b/Jenkinsfile
index e0a39b6..2e2caa8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -89,9 +89,7 @@
         run: {
             fastLane('android', 'test', '', 'rh-ruby24')
         },
-		args: "-v /usr/java:/usr/java"
-			+ " -v /usr/lib/jvm:/usr/lib/jvm"
-			+ " -v /opt/android:/opt/android"
+		args: "-v /opt/android:/opt/android"
 			+ " -e JAVA_HOME=${env.JAVA_HOME}"
 			+ " -e ANDROID_HOME=${env.ANDROID_HOME}"
 			+ " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
@@ -110,9 +108,7 @@
         run: {
             fastLane('android', 'build', '', 'rh-ruby24')
         },
-		args: "-v /usr/java:/usr/java"
-			+ " -v /usr/lib/jvm:/usr/lib/jvm"
-			+ " -v /opt/android:/opt/android"
+		args: "-v /opt/android:/opt/android"
 			+ " -v /opt/certificates:/opt/certificates"
 			+ " -e JAVA_HOME=${env.JAVA_HOME}"
 			+ " -e ANDROID_HOME=${env.ANDROID_HOME}"
@@ -188,9 +184,7 @@
                 fastLane('android', 'alpha', '', 'rh-ruby24')
             }
         },
-		args: "-v /usr/java:/usr/java"
-			+ " -v /usr/lib/jvm:/usr/lib/jvm"
-			+ " -v /opt/android:/opt/android"
+		args: "-v /opt/android:/opt/android"
 			+ " -e JAVA_HOME=${env.JAVA_HOME}"
 			+ " -e ANDROID_HOME=${env.ANDROID_HOME}"
 			+ " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
@@ -212,7 +206,10 @@
                 fastLane('android', 'beta', '', 'rh-ruby24')
             }
         },
-		args: "-v /usr/java:/usr/java -v /usr/lib/jvm:/usr/lib/jvm -v /opt/android:/opt/android -e ANDROID_HOME=${env.ANDROID_HOME} -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
+		args: "-v /opt/android:/opt/android"
+		+ " -e JAVA_HOME=${env.JAVA_HOME}"
+		+ " -e ANDROID_HOME=${env.ANDROID_HOME}"
+		+ " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
 		in: [ 'centos7' ],
         on: 'android',
     ]
@@ -231,9 +228,7 @@
                 fastLane('android', 'beta_crash', "fl_branch:\"${lazyConfig['branch']}\"", 'rh-ruby24')
             }
         },
-		args: "-v /usr/java:/usr/java"
-			+ " -v /usr/lib/jvm:/usr/lib/jvm"
-			+ " -v /opt/android:/opt/android"
+		args: "-v /opt/android:/opt/android"
 			+ " -e JAVA_HOME=${env.JAVA_HOME}"
 			+ " -e ANDROID_HOME=${env.ANDROID_HOME}"
 			+ " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
@@ -255,9 +250,7 @@
                 fastLane('android', 'production', '', 'rh-ruby24')
             }
         },
-		args: "-v /usr/java:/usr/java"
-			+ " -v /usr/lib/jvm:/usr/lib/jvm"
-			+ " -v /opt/android:/opt/android"
+		args: "-v /opt/android:/opt/android"
 			+ " -e JAVA_HOME=${env.JAVA_HOME}"
 			+ " -e ANDROID_HOME=${env.ANDROID_HOME}"
 			+ " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
diff --git a/lazyDir/centos7.Dockerfile b/lazyDir/centos7.Dockerfile
index cd95316..4292876 100644
--- a/lazyDir/centos7.Dockerfile
+++ b/lazyDir/centos7.Dockerfile
@@ -69,8 +69,12 @@
 # Install extra java deps
 RUN yum -q clean expire-cache \
 	&& yum -y install tzdata-java \
+	java-11-openjdk-devel \
 	&& yum -q clean packages
 
+# Create a symbolic link to latest JVM - for legacy scripts
+RUN mkdir /usr/java && ln -s /usr/lib/jvm/java-11-openjdk /usr/java/latest
+
 # Parameters for default user:group
 ARG uid=1000
 ARG user=android