diff --git a/src/java/cloudbuild.yaml b/src/java/cloudbuild.yaml
index d5e15eb1..3613f5c1 100644
--- a/src/java/cloudbuild.yaml
+++ b/src/java/cloudbuild.yaml
@@ -18,7 +18,7 @@ steps:
       - build
       - >-
         $_AR_HOSTNAME/$_AR_PROJECT_ID/$_AR_REPOSITORY/$REPO_NAME/$_SERVICE_NAME:$COMMIT_SHA
-      - '--builder=gcr.io/buildpacks/builder:latest'
+      - '--builder=gcr.io/buildpacks/builder:google-22'
       - '--run-image=$_AR_HOSTNAME/$_AR_PROJECT_ID/$_AR_REPOSITORY/$REPO_NAME/java-run:latest'
       - '--network=cloudbuild'
       - '--path=src/java'
diff --git a/src/java/run.Dockerfile b/src/java/run.Dockerfile
index 24f73a96..7bc6f142 100644
--- a/src/java/run.Dockerfile
+++ b/src/java/run.Dockerfile
@@ -1,2 +1,2 @@
-FROM gcr.io/buildpacks/gcp/run
+FROM gcr.io/buildpacks/google-22/run
 USER root