diff --git a/javac/Dockerfile b/javac/Dockerfile
index 7ead615da..05bd39586 100644
--- a/javac/Dockerfile
+++ b/javac/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=marketplace.gcr.io/google/openjdk8
+ARG BASE_IMAGE=launcher.gcr.io/google/openjdk8
 FROM ${BASE_IMAGE}
 
 ARG DOCKER_VERSION=5:19.03.8~3-0~debian-stretch
@@ -18,8 +18,7 @@ RUN \
 RUN \
    apt-get update -qqy && apt-get dist-upgrade -yq && \
    apt-get --fix-broken -y install && \
-   apt-get -y install apt-transport-https ca-certificates curl gnupg2 \
-   software-properties-common less bzip2 && \
+   apt-get -y install apt-transport-https ca-certificates curl gnupg2 software-properties-common && \
    curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
    apt-key fingerprint 9DC858229FC7DD38854AE2D88D81803C0EBFCD88 && \
    add-apt-repository \
diff --git a/javac/cloudbuild.yaml b/javac/cloudbuild.yaml
index b2228edc5..6cb614051 100644
--- a/javac/cloudbuild.yaml
+++ b/javac/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
   args:
   - 'build'
   - '--no-cache'
-  - '--build-arg=BASE_IMAGE=marketplace.gcr.io/google/openjdk8'
+  - '--build-arg=BASE_IMAGE=launcher.gcr.io/google/openjdk8'
   - '--build-arg=DOCKER_VERSION=5:19.03.8~3-0~debian-stretch'
   - '--tag=gcr.io/$PROJECT_ID/javac:8'
   - '--tag=gcr.io/$PROJECT_ID/javac'