diff --git a/docs/new_project_guide.md b/docs/new_project_guide.md
index ea9b1ad2f..b9cddbda7 100644
--- a/docs/new_project_guide.md
+++ b/docs/new_project_guide.md
@@ -66,7 +66,7 @@ Example: [boringssl](https://github.com/google/oss-fuzz/blob/master/projects/bor
 This file defines the Docker image definition. This is where the build.sh script will be executed in.
 It is very simple for most projects:
 ```docker
-FROM ossfuzz/base-builder               # base image with clang toolchain
+FROM gcr.io/oss-fuzz/base-builder               # base image with clang toolchain
 MAINTAINER YOUR_EMAIL                     # maintainer for this file
 RUN apt-get install -y ...                # install required packages to build your project
 RUN git clone <git_url> <checkout_dir>    # checkout all sources needed to build your project
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index b21dd308b..44182178c 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-clang
+FROM gcr.io/oss-fuzz/base-clang
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y git subversion jq python3 zip make
 
diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile
index 334cb571c..f6d5e48e2 100644
--- a/infra/base-images/base-clang/Dockerfile
+++ b/infra/base-images/base-clang/Dockerfile
@@ -16,7 +16,7 @@
 
 # Docker image with head clang installed.
 
-FROM ossfuzz/base-image
+FROM gcr.io/oss-fuzz/base-image
 MAINTAINER mike.aizatsky@gmail.com
 
 RUN apt-get install -y libc6-dev binutils libgcc-5-dev
diff --git a/infra/base-images/base-runner-debug/Dockerfile b/infra/base-images/base-runner-debug/Dockerfile
index f2469ab87..3b6b3c103 100644
--- a/infra/base-images/base-runner-debug/Dockerfile
+++ b/infra/base-images/base-runner-debug/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-runner
+FROM gcr.io/oss-fuzz/base-runner
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y gdb zip
 
diff --git a/infra/base-images/base-runner/Dockerfile b/infra/base-images/base-runner/Dockerfile
index 23c877db8..706d7a100 100644
--- a/infra/base-images/base-runner/Dockerfile
+++ b/infra/base-images/base-runner/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-image
+FROM gcr.io/oss-fuzz/base-image
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y zip file
 COPY llvm-symbolizer reproduce run_fuzzer test_all test_report \
diff --git a/infra/templates.py b/infra/templates.py
index d0f792473..40dd1c558 100755
--- a/infra/templates.py
+++ b/infra/templates.py
@@ -36,7 +36,7 @@ DOCKER_TEMPLATE = """\
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER your@email.com
 RUN apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 <git_url> %(project_name)s     # or use other version control
diff --git a/projects/arduinojson/Dockerfile b/projects/arduinojson/Dockerfile
index e0e125f9f..e45702d59 100644
--- a/projects/arduinojson/Dockerfile
+++ b/projects/arduinojson/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER oss-fuzz@benoitblanchon.fr
 RUN apt-get install -y make zip git
 RUN git clone --depth 1 https://github.com/bblanchon/ArduinoJson.git arduinojson
diff --git a/projects/boringssl/Dockerfile b/projects/boringssl/Dockerfile
index e80887f21..b4555026c 100644
--- a/projects/boringssl/Dockerfile
+++ b/projects/boringssl/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y cmake ninja-build golang
 
diff --git a/projects/botan/Dockerfile b/projects/botan/Dockerfile
index fc2db317c..ea3fbd66e 100644
--- a/projects/botan/Dockerfile
+++ b/projects/botan/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER jack@randombit.net
 RUN apt-get install -y make python
 RUN git clone --depth 1 https://github.com/randombit/botan.git botan
diff --git a/projects/brotli/Dockerfile b/projects/brotli/Dockerfile
index add0afb6d..f208e141c 100644
--- a/projects/brotli/Dockerfile
+++ b/projects/brotli/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER eustas@chromium.org
 RUN apt-get install -y cmake libtool make
 
diff --git a/projects/c-ares/Dockerfile b/projects/c-ares/Dockerfile
index 2dccca11d..cde9713ca 100644
--- a/projects/c-ares/Dockerfile
+++ b/projects/c-ares/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mmoroz@chromium.org
 RUN apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/c-ares/c-ares.git
diff --git a/projects/curl/Dockerfile b/projects/curl/Dockerfile
index a2e05a55e..130bb4fb6 100644
--- a/projects/curl/Dockerfile
+++ b/projects/curl/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER dvyukov@google.com
 RUN apt-get install -y make autoconf automake libtool libssl-dev zlib1g-dev
 
diff --git a/projects/expat/Dockerfile b/projects/expat/Dockerfile
index f30374968..b0432a970 100644
--- a/projects/expat/Dockerfile
+++ b/projects/expat/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y make autoconf automake libtool docbook2x
 
diff --git a/projects/ffmpeg/Dockerfile b/projects/ffmpeg/Dockerfile
index 94adc25a0..347e0a1db 100644
--- a/projects/ffmpeg/Dockerfile
+++ b/projects/ffmpeg/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mmoroz@chromium.org
 RUN apt-get install -y make autoconf automake libtool build-essential \
     libass-dev libfreetype6-dev libsdl1.2-dev \
diff --git a/projects/file/Dockerfile b/projects/file/Dockerfile
index 4219d9ecc..9d974aa06 100644
--- a/projects/file/Dockerfile
+++ b/projects/file/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y make autoconf automake libtool shtool
 RUN git clone --depth 1 https://github.com/file/file.git
diff --git a/projects/freetype2/Dockerfile b/projects/freetype2/Dockerfile
index e67ba0f25..593d0d2e7 100644
--- a/projects/freetype2/Dockerfile
+++ b/projects/freetype2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y make autoconf libtool libarchive-dev
 
diff --git a/projects/gnutls/Dockerfile b/projects/gnutls/Dockerfile
index 1f5476a51..f69c4fd67 100644
--- a/projects/gnutls/Dockerfile
+++ b/projects/gnutls/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER alex.gaynor@gmail.com
 RUN apt-get install -y make autoconf automake libtool autopoint libnettle6 nettle-dev pkg-config gperf bison autogen texinfo curl
 
diff --git a/projects/grpc/Dockerfile b/projects/grpc/Dockerfile
index bf9eba4dc..47a69f09d 100644
--- a/projects/grpc/Dockerfile
+++ b/projects/grpc/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mattkwong@google.com
 
 RUN apt-get install -y software-properties-common python-software-properties
diff --git a/projects/h2o/Dockerfile b/projects/h2o/Dockerfile
index 705be6c08..b80ad885c 100644
--- a/projects/h2o/Dockerfile
+++ b/projects/h2o/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER jonathan.foote@gmail.com
 RUN apt-get install -y make autoconf automake libtool cmake zlib1g-dev pkg-config libssl-dev
 RUN git clone https://github.com/h2o/h2o
diff --git a/projects/harfbuzz/Dockerfile b/projects/harfbuzz/Dockerfile
index ea758ef55..39d93e45c 100644
--- a/projects/harfbuzz/Dockerfile
+++ b/projects/harfbuzz/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mmoroz@chromium.org
 RUN apt-get install -y make autoconf automake libtool ragel pkg-config
 
diff --git a/projects/icu/Dockerfile b/projects/icu/Dockerfile
index d5af0cf49..ffe2f7d5b 100644
--- a/projects/icu/Dockerfile
+++ b/projects/icu/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y make
 
diff --git a/projects/irssi/Dockerfile b/projects/irssi/Dockerfile
index b548129a4..e1177126c 100644
--- a/projects/irssi/Dockerfile
+++ b/projects/irssi/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER joseph.bisch@gmail.com
 RUN apt-get install -y make autoconf automake libtool pkg-config libglib2.0-dev libncurses5-dev libssl-dev openssl lynx
 RUN git clone https://github.com/irssi/irssi
diff --git a/projects/json/Dockerfile b/projects/json/Dockerfile
index 12d962b84..7cea32c5a 100644
--- a/projects/json/Dockerfile
+++ b/projects/json/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER vitalybuka@chromium.org
 RUN apt-get install -y binutils make
 
diff --git a/projects/lcms/Dockerfile b/projects/lcms/Dockerfile
index 093a0229a..4b4101cd0 100644
--- a/projects/lcms/Dockerfile
+++ b/projects/lcms/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kcwu@google.com
 RUN apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/mm2/Little-CMS.git lcms
diff --git a/projects/libarchive/Dockerfile b/projects/libarchive/Dockerfile
index f03a70b72..993962d54 100644
--- a/projects/libarchive/Dockerfile
+++ b/projects/libarchive/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kcwu@google.com
 
 # Installing optional libraries can utilize more code path and/or improve
diff --git a/projects/libass/Dockerfile b/projects/libass/Dockerfile
index 9cf0c88f3..791d90705 100644
--- a/projects/libass/Dockerfile
+++ b/projects/libass/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER eugeni.stepanov@gmail.com
 RUN apt-get install -y make autoconf automake libtool pkg-config libfreetype6-dev libfontconfig1-dev
 
diff --git a/projects/libchewing/Dockerfile b/projects/libchewing/Dockerfile
index 6645316fd..c6793b82c 100644
--- a/projects/libchewing/Dockerfile
+++ b/projects/libchewing/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kcwu@csie.org
 RUN apt-get install -y make autoconf automake libtool texinfo
 
diff --git a/projects/libjpeg-turbo/Dockerfile b/projects/libjpeg-turbo/Dockerfile
index 04ee51228..eca5e16cc 100644
--- a/projects/libjpeg-turbo/Dockerfile
+++ b/projects/libjpeg-turbo/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER alex.gaynor@gmail.com
 RUN apt-get install -y make autoconf automake libtool nasm curl
 RUN git clone --depth 1 https://github.com/libjpeg-turbo/libjpeg-turbo
diff --git a/projects/libplist/Dockerfile b/projects/libplist/Dockerfile
index 9db7856a3..e3d79966f 100644
--- a/projects/libplist/Dockerfile
+++ b/projects/libplist/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER nikias@gmx.li
 RUN apt-get install -y make autoconf automake libtool pkg-config
 
diff --git a/projects/libpng/Dockerfile b/projects/libpng/Dockerfile
index 61a6fda5e..2af5ea256 100644
--- a/projects/libpng/Dockerfile
+++ b/projects/libpng/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mmoroz@chromium.org
 RUN apt-get install -y make autoconf automake libtool zlib1g-dev
 
diff --git a/projects/libprotobuf-mutator/Dockerfile b/projects/libprotobuf-mutator/Dockerfile
index 7e45151bd..34bb879d8 100644
--- a/projects/libprotobuf-mutator/Dockerfile
+++ b/projects/libprotobuf-mutator/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER vitalybuka@chromium.org
 RUN apt-get install -y make autoconf automake libtool pkg-config cmake \
     ninja-build liblzma-dev libz-dev docbook2x
diff --git a/projects/libreoffice/Dockerfile b/projects/libreoffice/Dockerfile
index b07141d42..922170bb2 100644
--- a/projects/libreoffice/Dockerfile
+++ b/projects/libreoffice/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER officesecurity@lists.freedesktop.org
 #build requirements
 RUN apt-get build-dep -y libreoffice
diff --git a/projects/libteken/Dockerfile b/projects/libteken/Dockerfile
index d7689007f..d3639c1a4 100644
--- a/projects/libteken/Dockerfile
+++ b/projects/libteken/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kcwu@csie.org
 RUN apt-get install -y pmake
 RUN svn co https://svn.freebsd.org/base/head/sys/teken libteken
diff --git a/projects/libtsm/Dockerfile b/projects/libtsm/Dockerfile
index 9ec84e223..b059064bf 100644
--- a/projects/libtsm/Dockerfile
+++ b/projects/libtsm/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kcwu@csie.org
 RUN apt-get install -y make autoconf automake libtool pkg-config
 
diff --git a/projects/libxml2/Dockerfile b/projects/libxml2/Dockerfile
index 52aaa8464..7bde523ed 100644
--- a/projects/libxml2/Dockerfile
+++ b/projects/libxml2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER ochang@chromium.org
 RUN apt-get install -y make autoconf automake libtool pkg-config
 
diff --git a/projects/libyaml/Dockerfile b/projects/libyaml/Dockerfile
index f8f3f7258..b2c09ffcb 100644
--- a/projects/libyaml/Dockerfile
+++ b/projects/libyaml/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER alex.gaynor@gmail.com
 RUN apt-get install -y make autoconf automake libtool
 
diff --git a/projects/llvm_libcxxabi/Dockerfile b/projects/llvm_libcxxabi/Dockerfile
index b21ec9341..4c4356edf 100644
--- a/projects/llvm_libcxxabi/Dockerfile
+++ b/projects/llvm_libcxxabi/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kcc@google.com
 RUN apt-get install -y subversion
 
diff --git a/projects/nghttp2/Dockerfile b/projects/nghttp2/Dockerfile
index 3d7b52b90..e32633bf5 100644
--- a/projects/nghttp2/Dockerfile
+++ b/projects/nghttp2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER tatsuhiro.t@gmail.com
 RUN apt-get install -y make autoconf automake libtool pkg-config
 RUN git clone --depth 1 https://github.com/nghttp2/nghttp2.git
diff --git a/projects/nss/Dockerfile b/projects/nss/Dockerfile
index f494a9b5c..0ec16161d 100644
--- a/projects/nss/Dockerfile
+++ b/projects/nss/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mmoroz@chromium.org
 RUN apt-get install -y make mercurial zlib1g-dev gyp ninja-build libssl-dev
 
diff --git a/projects/openssl/Dockerfile b/projects/openssl/Dockerfile
index 5ed9acdd4..7f00bcdc0 100644
--- a/projects/openssl/Dockerfile
+++ b/projects/openssl/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kurt@roeckx.be
 RUN apt-get install -y make
 RUN git clone --depth 1 https://github.com/openssl/openssl.git
diff --git a/projects/opus/Dockerfile b/projects/opus/Dockerfile
index e8551de71..9ec04e2c8 100644
--- a/projects/opus/Dockerfile
+++ b/projects/opus/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER flim@google.com
 RUN apt-get install -y make autoconf automake libtool wget
 
diff --git a/projects/ots/Dockerfile b/projects/ots/Dockerfile
index fa265eff4..bc163abb3 100644
--- a/projects/ots/Dockerfile
+++ b/projects/ots/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mmoroz@chromium.org
 RUN apt-get install -y make autoconf automake libtool pkg-config zlib1g-dev
 RUN git clone --depth 1 https://github.com/khaledhosny/ots.git
diff --git a/projects/pcre2/Dockerfile b/projects/pcre2/Dockerfile
index 51865af99..ee6a9a9d2 100644
--- a/projects/pcre2/Dockerfile
+++ b/projects/pcre2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER kcc@google.com
 RUN apt-get install -y make autoconf automake libtool subversion
 
diff --git a/projects/re2/Dockerfile b/projects/re2/Dockerfile
index e0ae81a9c..3b4335998 100644
--- a/projects/re2/Dockerfile
+++ b/projects/re2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER wrengr@chromium.org
 RUN apt-get install -y make autoconf automake libtool
 
diff --git a/projects/sqlite3/Dockerfile b/projects/sqlite3/Dockerfile
index 2ca4cf0a9..e091ed447 100644
--- a/projects/sqlite3/Dockerfile
+++ b/projects/sqlite3/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER tanin@google.com
 RUN apt-get install -y make autoconf automake libtool curl tcl
 
diff --git a/projects/tor/Dockerfile b/projects/tor/Dockerfile
index b38e6a5cb..6e2789a57 100644
--- a/projects/tor/Dockerfile
+++ b/projects/tor/Dockerfile
@@ -14,7 +14,7 @@
 #
 ##############################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER nickm@torproject.org
 RUN apt-get install -y zlib1g zlib1g-dev libevent-dev libevent-2.0 openssl autoconf automake libssl-dev make
 RUN git clone https://git.torproject.org/tor.git
diff --git a/projects/tpm2/Dockerfile b/projects/tpm2/Dockerfile
index 93c6cb5b8..0dcfb42ee 100644
--- a/projects/tpm2/Dockerfile
+++ b/projects/tpm2/Dockerfile
@@ -4,7 +4,7 @@
 #
 # Defines a docker image that can build fuzzers.
 #
-FROM ossfuzz/base-libfuzzer
+FROM gcr.io/oss-fuzz/base-libfuzzer
 RUN apt-get install -y make libssl-dev binutils libgcc-5-dev
 RUN git clone --depth 1 https://chromium.googlesource.com/chromiumos/third_party/tpm2
 WORKDIR tpm2
diff --git a/projects/woff2/Dockerfile b/projects/woff2/Dockerfile
index ad0d22db1..b1dc7ff4b 100644
--- a/projects/woff2/Dockerfile
+++ b/projects/woff2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER mmoroz@chromium.org
 RUN apt-get install -y make autoconf automake libtool
 
diff --git a/projects/zlib/Dockerfile b/projects/zlib/Dockerfile
index 7c7d181fd..5e5f21f5d 100644
--- a/projects/zlib/Dockerfile
+++ b/projects/zlib/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM ossfuzz/base-builder
+FROM gcr.io/oss-fuzz/base-builder
 MAINTAINER inferno@chromium.org
 RUN apt-get install -y make autoconf automake libtool