diff --git a/Dockerfile b/Dockerfile
index 233f91d3d..ee654201d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 
 RUN apt-get update && \
     apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev  \
-      libxml2-dev libxslt-dev openjdk-8-jdk-headless curl iputils-ping netcat && \
+      libxml2-dev libxslt-dev openjdk-11-jdk-headless curl iputils-ping netcat && \
     apt-get clean
 
 WORKDIR /root
diff --git a/Dockerfile.base b/Dockerfile.base
index a33c1bfd2..a9c189500 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,9 +1,9 @@
 #logstash-base image, use ci/docker_update_base_image.sh to push updates
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 
 RUN apt-get update && \
     apt-get install -y zlib1g-dev build-essential vim rake git curl libssl-dev libreadline-dev libyaml-dev  \
-      libxml2-dev libxslt-dev openjdk-8-jdk-headless curl iputils-ping netcat && \
+      libxml2-dev libxslt-dev openjdk-11-jdk-headless curl iputils-ping netcat && \
     apt-get clean
 
 WORKDIR /root
diff --git a/build.gradle b/build.gradle
index da1de07f3..5b2275e6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,6 +38,9 @@ allprojects {
 
   tasks.withType(Javadoc) {
       options.addStringOption("Xwerror", "-quiet")
+      if (JavaVersion.current().compareTo(JavaVersion.VERSION_1_9) > 0) {
+          options.addBooleanOption("html5", true)
+      }
   }
 
   clean {
diff --git a/docker/templates/Dockerfile.j2 b/docker/templates/Dockerfile.j2
index 0bbf5ae84..66a823c16 100644
--- a/docker/templates/Dockerfile.j2
+++ b/docker/templates/Dockerfile.j2
@@ -10,7 +10,7 @@ FROM centos:7
 
 # Install Java and the "which" command, which is needed by Logstash's shell
 # scripts.
-RUN yum update -y && yum install -y java-1.8.0-openjdk-devel which && \
+RUN yum update -y && yum install -y java-11-openjdk-devel which && \
     yum clean all
 
 # Provide a non-root user to run the process.