oss-fuzz/BASE_IMAGE -> oss-fuzz-base/BASE_IMAGE

53 files changed, 59 insertions, 59 deletions

diff --git a/docs/debugging.md b/docs/debugging.md
index 10c3fe7d..4e97aadb 100644
--- a/docs/debugging.md
+++ b/docs/debugging.md
@@ -14,5 +14,5 @@ If you decide to debug a fuzzer with gdb (which is already installed in base-run
 you will need to start a container in privileged mode:
 
 ```bash
-docker run -ti --privileged -v /tmp/out:/out gcr.io/oss-fuzz/base-runner-debug gdb /out/<fuzz_target_name>
+docker run -ti --privileged -v /tmp/out:/out gcr.io/oss-fuzz-base/base-runner-debug gdb /out/<fuzz_target_name>
 ```
diff --git a/docs/new_project_guide.md b/docs/new_project_guide.md
index b9cddbda..3226128a 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 gcr.io/oss-fuzz/base-builder               # base image with clang toolchain
+FROM gcr.io/oss-fuzz-base/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/all.sh b/infra/base-images/all.sh
index ccd50bda..07f322c4 100755
--- a/infra/base-images/all.sh
+++ b/infra/base-images/all.sh
@@ -15,8 +15,8 @@
 #
 ################################################################################
 
-docker build --pull -t gcr.io/oss-fuzz/base-image $@ infra/base-images/base-image
-docker build -t gcr.io/oss-fuzz/base-clang $@ infra/base-images/base-clang
-docker build -t gcr.io/oss-fuzz/base-builder -t gcr.io/oss-fuzz/base-libfuzzer $@ infra/base-images/base-builder
-docker build -t gcr.io/oss-fuzz/base-runner $@ infra/base-images/base-runner
-docker build -t gcr.io/oss-fuzz/base-runner-debug $@ infra/base-images/base-runner-debug
+docker build --pull -t gcr.io/oss-fuzz-base/base-image $@ infra/base-images/base-image
+docker build -t gcr.io/oss-fuzz-base/base-clang $@ infra/base-images/base-clang
+docker build -t gcr.io/oss-fuzz-base/base-builder -t gcr.io/oss-fuzz/base-libfuzzer $@ infra/base-images/base-builder
+docker build -t gcr.io/oss-fuzz-base/base-runner $@ infra/base-images/base-runner
+docker build -t gcr.io/oss-fuzz-base/base-runner-debug $@ infra/base-images/base-runner-debug
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 44182178..4a45cb2b 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-clang
+FROM gcr.io/oss-fuzz-base/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 f6d5e48e..8e1bc81f 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 gcr.io/oss-fuzz/base-image
+FROM gcr.io/oss-fuzz-base/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 3b6b3c10..dd739c33 100644
--- a/infra/base-images/base-runner-debug/Dockerfile
+++ b/infra/base-images/base-runner-debug/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-runner
+FROM gcr.io/oss-fuzz-base/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 706d7a10..018ff274 100644
--- a/infra/base-images/base-runner/Dockerfile
+++ b/infra/base-images/base-runner/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-image
+FROM gcr.io/oss-fuzz-base/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/base-images/base-runner/README.md b/infra/base-images/base-runner/README.md
index ac2fa834..1c0f6a29 100644
--- a/infra/base-images/base-runner/README.md
+++ b/infra/base-images/base-runner/README.md
@@ -2,7 +2,7 @@
 > Base image for fuzzer runners.
 
 ```bash
-docker run -ti gcr.io/oss-fuzz/base-runner <command> <args>
+docker run -ti gcr.io/oss-fuzz-base/base-runner <command> <args>
 ```
 
 ## Commands
diff --git a/infra/helper.py b/infra/helper.py
index 74030673..8345776e 100755
--- a/infra/helper.py
+++ b/infra/helper.py
@@ -247,7 +247,7 @@ def run_fuzzer(run_args):
       'docker', 'run', '--rm', '-i', '--cap-add', 'SYS_PTRACE',
   ] + sum([['-e', v] for v in env], []) + [
       '-v', '%s:/out' % os.path.join(BUILD_DIR, 'out', args.project_name),
-      '-t', 'gcr.io/oss-fuzz/base-runner',
+      '-t', 'gcr.io/oss-fuzz-base/base-runner',
       'run_fuzzer',
       args.fuzzer_name,
   ] + args.fuzzer_args
@@ -284,7 +284,7 @@ def coverage(run_args):
       '-v', '%s:/out' % os.path.join(BUILD_DIR, 'out', args.project_name),
       '-v', '%s:/cov' % temp_dir,
       '-w', '/cov',
-      '-t', 'gcr.io/oss-fuzz/base-runner',
+      '-t', 'gcr.io/oss-fuzz-base/base-runner',
       '/out/%s' % args.fuzzer_name,
       '-dump_coverage=1',
       '-max_total_time=%s' % args.run_time
@@ -335,7 +335,7 @@ def reproduce(run_args):
       'docker', 'run', '--rm', '-i', '--cap-add', 'SYS_PTRACE',
       '-v', '%s:/out' % os.path.join(BUILD_DIR, 'out', args.project_name),
       '-v', '%s:/testcase' % _get_absolute_path(args.testcase_path),
-      '-t', 'gcr.io/oss-fuzz/base-runner',
+      '-t', 'gcr.io/oss-fuzz-base/base-runner',
       'reproduce',
       args.fuzzer_name,
       '-runs=100',
diff --git a/infra/templates.py b/infra/templates.py
index 40dd1c55..2bce9e98 100755
--- a/infra/templates.py
+++ b/infra/templates.py
@@ -36,7 +36,7 @@ DOCKER_TEMPLATE = """\
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 e45702d5..c0357e4c 100644
--- a/projects/arduinojson/Dockerfile
+++ b/projects/arduinojson/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 b4555026..2de033a0 100644
--- a/projects/boringssl/Dockerfile
+++ b/projects/boringssl/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 ea3fbd66..63367c4b 100644
--- a/projects/botan/Dockerfile
+++ b/projects/botan/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 f208e141..a502f2cc 100644
--- a/projects/brotli/Dockerfile
+++ b/projects/brotli/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 cde9713c..1534e9b1 100644
--- a/projects/c-ares/Dockerfile
+++ b/projects/c-ares/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 130bb4fb..0069fbde 100644
--- a/projects/curl/Dockerfile
+++ b/projects/curl/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 b0432a97..5ce25eea 100644
--- a/projects/expat/Dockerfile
+++ b/projects/expat/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 347e0a1d..d5f2f5a2 100644
--- a/projects/ffmpeg/Dockerfile
+++ b/projects/ffmpeg/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 9d974aa0..f7850855 100644
--- a/projects/file/Dockerfile
+++ b/projects/file/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 593d0d2e..476f6079 100644
--- a/projects/freetype2/Dockerfile
+++ b/projects/freetype2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 f69c4fd6..6c07d30c 100644
--- a/projects/gnutls/Dockerfile
+++ b/projects/gnutls/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 0a4a4688..6038f42b 100644
--- a/projects/grpc/Dockerfile
+++ b/projects/grpc/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 b80ad885..ba50c3e8 100644
--- a/projects/h2o/Dockerfile
+++ b/projects/h2o/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 39d93e45..9ebb8b86 100644
--- a/projects/harfbuzz/Dockerfile
+++ b/projects/harfbuzz/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 ffe2f7d5..ed61fb3f 100644
--- a/projects/icu/Dockerfile
+++ b/projects/icu/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y make
 
diff --git a/projects/irssi/Dockerfile b/projects/irssi/Dockerfile
index e1177126..753fcf8c 100644
--- a/projects/irssi/Dockerfile
+++ b/projects/irssi/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 7cea32c5..82afe016 100644
--- a/projects/json/Dockerfile
+++ b/projects/json/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER vitalybuka@chromium.org
 RUN apt-get install -y binutils make
 
diff --git a/projects/lcms/Dockerfile b/projects/lcms/Dockerfile
index 4b4101cd..d73ca98a 100644
--- a/projects/lcms/Dockerfile
+++ b/projects/lcms/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 993962d5..84a76f1c 100644
--- a/projects/libarchive/Dockerfile
+++ b/projects/libarchive/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 791d9070..c9bdd656 100644
--- a/projects/libass/Dockerfile
+++ b/projects/libass/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 c6793b82..70ca53d3 100644
--- a/projects/libchewing/Dockerfile
+++ b/projects/libchewing/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 eca5e16c..dcff2c36 100644
--- a/projects/libjpeg-turbo/Dockerfile
+++ b/projects/libjpeg-turbo/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 e3d79966..a8527b6f 100644
--- a/projects/libplist/Dockerfile
+++ b/projects/libplist/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 2af5ea25..845c78c7 100644
--- a/projects/libpng/Dockerfile
+++ b/projects/libpng/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 34bb879d..6ae60690 100644
--- a/projects/libprotobuf-mutator/Dockerfile
+++ b/projects/libprotobuf-mutator/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 1dc8de25..1b6fe1c5 100644
--- a/projects/libreoffice/Dockerfile
+++ b/projects/libreoffice/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 d3639c1a..4bc72ef3 100644
--- a/projects/libteken/Dockerfile
+++ b/projects/libteken/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 b059064b..61b196a0 100644
--- a/projects/libtsm/Dockerfile
+++ b/projects/libtsm/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 7bde523e..fb8b7fef 100644
--- a/projects/libxml2/Dockerfile
+++ b/projects/libxml2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 b2c09ffc..cd8d328f 100644
--- a/projects/libyaml/Dockerfile
+++ b/projects/libyaml/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 4c4356ed..49ef8616 100644
--- a/projects/llvm_libcxxabi/Dockerfile
+++ b/projects/llvm_libcxxabi/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER kcc@google.com
 RUN apt-get install -y subversion
 
diff --git a/projects/nghttp2/Dockerfile b/projects/nghttp2/Dockerfile
index e32633bf..735826a4 100644
--- a/projects/nghttp2/Dockerfile
+++ b/projects/nghttp2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 0ec16161..37578393 100644
--- a/projects/nss/Dockerfile
+++ b/projects/nss/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 7f00bcdc..a18ccb33 100644
--- a/projects/openssl/Dockerfile
+++ b/projects/openssl/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 9ec04e2c..f8d8781c 100644
--- a/projects/opus/Dockerfile
+++ b/projects/opus/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 bc163abb..e1fa778d 100644
--- a/projects/ots/Dockerfile
+++ b/projects/ots/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 ee6a9a9d..ef94ed00 100644
--- a/projects/pcre2/Dockerfile
+++ b/projects/pcre2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 3b433599..05a40f1d 100644
--- a/projects/re2/Dockerfile
+++ b/projects/re2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 e091ed44..c39de814 100644
--- a/projects/sqlite3/Dockerfile
+++ b/projects/sqlite3/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 6e2789a5..09358305 100644
--- a/projects/tor/Dockerfile
+++ b/projects/tor/Dockerfile
@@ -14,7 +14,7 @@
 #
 ##############################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 f11f82ac..e4446c7b 100644
--- a/projects/tpm2/Dockerfile
+++ b/projects/tpm2/Dockerfile
@@ -4,7 +4,7 @@
 #
 # Defines a docker image that can build fuzzers.
 #
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder
 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 b1dc7ff4..fdef9d01 100644
--- a/projects/woff2/Dockerfile
+++ b/projects/woff2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/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 5e5f21f5..32a48172 100644
--- a/projects/zlib/Dockerfile
+++ b/projects/zlib/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder
 MAINTAINER inferno@chromium.org
 RUN apt-get install -y make autoconf automake libtool