diff --git a/release/builder/build.sh b/release/builder/build.sh
index ce0f4d855..617905fd1 100755
--- a/release/builder/build.sh
+++ b/release/builder/build.sh
@@ -20,7 +20,7 @@ locale-gen en_US.UTF-8
 apt-get install apt-utils -y
 apt-get upgrade -y
 # Install Java
-apt-get install openjdk-8-jdk-headless -y
+apt-get install openjdk-11-jdk-headless -y
 # Install npm
 apt-get install npm -y
 # Install gcloud
diff --git a/release/cloudbuild-kythe.yaml b/release/cloudbuild-kythe.yaml
index e900c5504..2a3b5e528 100644
--- a/release/cloudbuild-kythe.yaml
+++ b/release/cloudbuild-kythe.yaml
@@ -14,7 +14,7 @@
 # https://cloud.google.com/cloud-build/docs/running-builds/automate-builds
 steps:
 # Download Kythe
-- name: 'openjdk:11'
+- name: 'gcr.io/${PROJECT_ID}/builder:latest'
   entrypoint: /bin/bash
   args:
   - -c
@@ -25,7 +25,7 @@ steps:
     rm kythe-${_KYTHE_VERSION}.tar.gz
     mv kythe-${_KYTHE_VERSION} kythe
 # Build Nomulus with the Kythe wrapper
-- name: 'openjdk:11'
+- name: 'gcr.io/${PROJECT_ID}/builder:latest'
   entrypoint: /bin/bash
   args:
   - -c
@@ -40,7 +40,7 @@ steps:
     ./gradlew clean testClasses -x compileProdJS \
       -Dno_werror=true -PenableCrossReferencing=true
 # Merge kzip files
-- name: 'openjdk:11'
+- name: 'gcr.io/${PROJECT_ID}/builder:latest'
   entrypoint: /bin/bash
   args:
   - -c
diff --git a/release/schema-deployer/Dockerfile b/release/schema-deployer/Dockerfile
index 47ca0d3a3..29b986421 100644
--- a/release/schema-deployer/Dockerfile
+++ b/release/schema-deployer/Dockerfile
@@ -15,23 +15,23 @@
 # This Dockerfile builds an image that can be used in Google Cloud Build.
 # We need the following programs to build the schema deployer:
 # 1. Bash to execute a shell script.
-# 2. Java 8 for running the Flywaydb commandline tool.
+# 2. Java 11 for running the Flywaydb commandline tool.
 # 2. Cloud SQL proxy for connection to the SQL instance.
 # 3. The Flywaydb commandline tool.
 #
 # Please refer to deploy_sql_schema.sh for expected volumes and arguments.
 
-# Although any Linux-based Java image with bash would work (e.g., openjdk:8),
+# Although any Linux-based Java image with bash would work (e.g., openjdk:11),
 # as a GCP application we prefer to start with a GCP-approved base image.
 FROM marketplace.gcr.io/google/ubuntu1804
 ENV DEBIAN_FRONTEND=noninteractive LANG=en_US.UTF-8
-# Install openjdk-8
+# Install openjdk-11
 RUN apt-get update -y \
     && apt-get install locales -y \
     && locale-gen en_US.UTF-8 \
     && apt-get install apt-utils -y \
     && apt-get upgrade -y \
-    && apt-get install openjdk-8-jdk-headless -y
+    && apt-get install openjdk-11-jdk-headless -y
 
 # Get netstat, used for checking Cloud SQL proxy readiness.
 RUN apt-get install net-tools