diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index c9fd7e02a9..65b3635413 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -18,7 +18,7 @@ FROM docker.io/opendevorg/python-builder:3.7 as builder
 COPY . /tmp/src
 RUN assemble
 
-FROM docker.io/library/openjdk:8 as gerrit-base
+FROM docker.io/library/openjdk:11 as gerrit-base
 
 RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends
 
@@ -69,4 +69,4 @@ ENV JAVA_OPTIONS ""
 # Ulimits should be set on command line or in docker-compose.yaml
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 # The /dev/./urandom is not a typo. https://stackoverflow.com/questions/58991966/what-java-security-egd-option-is-for
-CMD /usr/local/openjdk-8/bin/java -Djava.security.egd=file:/dev/./urandom ${JAVA_OPTIONS} -jar /var/gerrit/bin/gerrit.war daemon -d /var/gerrit
+CMD /usr/local/openjdk-11/bin/java -Djava.security.egd=file:/dev/./urandom ${JAVA_OPTIONS} -jar /var/gerrit/bin/gerrit.war daemon -d /var/gerrit
diff --git a/playbooks/roles/gerrit/templates/gerrit.config.j2 b/playbooks/roles/gerrit/templates/gerrit.config.j2
index df063cf446..56107ad4e0 100644
--- a/playbooks/roles/gerrit/templates/gerrit.config.j2
+++ b/playbooks/roles/gerrit/templates/gerrit.config.j2
@@ -27,7 +27,7 @@
 {% if gerrit_heap_limit is defined %}
 	heapLimit = {{ gerrit_heap_limit }}
 {% endif %}
-	javaHome = /usr/local/openjdk-8/jre
+	javaHome = /usr/local/openjdk-11/jre
 	javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
 	javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
 [gc]
diff --git a/playbooks/zuul/gerrit/repos.yaml b/playbooks/zuul/gerrit/repos.yaml
index 37154813d7..c89c959102 100644
--- a/playbooks/zuul/gerrit/repos.yaml
+++ b/playbooks/zuul/gerrit/repos.yaml
@@ -1,6 +1,7 @@
 - hosts: all
   roles:
-    - ensure-java
+    - role: ensure-java
+      java_version: 11
     - role: ensure-nodejs
       node_version: 10
     - ensure-bazelisk