diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index a960e2da2..ab8d45033 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -15,7 +15,6 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-clang
-MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y git \
     subversion \
     jq \
diff --git a/infra/base-images/base-clang/Dockerfile b/infra/base-images/base-clang/Dockerfile
index 94f99b1df..df8376d2a 100644
--- a/infra/base-images/base-clang/Dockerfile
+++ b/infra/base-images/base-clang/Dockerfile
@@ -17,7 +17,6 @@
 # Docker image with head clang installed.
 
 FROM gcr.io/oss-fuzz-base/base-image
-MAINTAINER mike.aizatsky@gmail.com
 
 COPY checkout_build_install_llvm.sh /root/
 # Keep all steps in the same script to decrease the number of intermediate
diff --git a/infra/base-images/base-image/Dockerfile b/infra/base-images/base-image/Dockerfile
index 17344d9ed..2099ffdd2 100644
--- a/infra/base-images/base-image/Dockerfile
+++ b/infra/base-images/base-image/Dockerfile
@@ -17,7 +17,6 @@
 # Base image for all other images.
 
 FROM ubuntu:16.04
-MAINTAINER mike.aizatsky@gmail.com
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \
     apt-get upgrade -y && \
diff --git a/infra/base-images/base-msan-builder/Dockerfile b/infra/base-images/base-msan-builder/Dockerfile
index e6117577c..315730b61 100644
--- a/infra/base-images/base-msan-builder/Dockerfile
+++ b/infra/base-images/base-msan-builder/Dockerfile
@@ -15,7 +15,6 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-clang
-MAINTAINER ochang@google.com
 RUN sed -i -r 's/#\s*deb-src/deb-src/g' /etc/apt/sources.list
 RUN apt-get update && apt-get install -y python dpkg-dev patchelf python-apt zip
 
diff --git a/infra/base-images/base-runner-debug/Dockerfile b/infra/base-images/base-runner-debug/Dockerfile
index d71b1eaf9..3d22bd778 100644
--- a/infra/base-images/base-runner-debug/Dockerfile
+++ b/infra/base-images/base-runner-debug/Dockerfile
@@ -15,6 +15,4 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-runner
-MAINTAINER mike.aizatsky@gmail.com
 RUN apt-get install -y gdb valgrind zip
-
diff --git a/infra/base-images/base-runner/Dockerfile b/infra/base-images/base-runner/Dockerfile
index 980e137b9..0be58102f 100644
--- a/infra/base-images/base-runner/Dockerfile
+++ b/infra/base-images/base-runner/Dockerfile
@@ -14,8 +14,16 @@
 #
 ################################################################################
 
+# Using multi-stage build to copy some LLVM binaries needed in the runner image.
+FROM gcr.io/oss-fuzz-base/base-clang AS base-clang
+
 FROM gcr.io/oss-fuzz-base/base-image
-MAINTAINER mike.aizatsky@gmail.com
+
+# Copy the binaries needed for code coverage and crash symbolization.
+COPY --from=base-clang /usr/local/bin/llvm-cov /usr/local/bin/
+COPY --from=base-clang /usr/local/bin/llvm-profdata /usr/local/bin/
+COPY --from=base-clang /usr/local/bin/llvm-symbolizer /usr/local/bin/
+
 RUN apt-get install -y \
     binutils \
     file \
@@ -35,9 +43,6 @@ COPY bad_build_check \
     coverage \
     coverage_helper \
     download_corpus \
-    llvm-cov \
-    llvm-profdata \
-    llvm-symbolizer \
     minijail0 \
     reproduce \
     run_fuzzer \
diff --git a/infra/base-images/base-runner/llvm-cov b/infra/base-images/base-runner/llvm-cov
deleted file mode 100755
index 9fb734dee..000000000
Binary files a/infra/base-images/base-runner/llvm-cov and /dev/null differ
diff --git a/infra/base-images/base-runner/llvm-profdata b/infra/base-images/base-runner/llvm-profdata
deleted file mode 100755
index 2dc6ead81..000000000
Binary files a/infra/base-images/base-runner/llvm-profdata and /dev/null differ
diff --git a/infra/base-images/base-runner/llvm-symbolizer b/infra/base-images/base-runner/llvm-symbolizer
deleted file mode 100755
index 793420656..000000000
Binary files a/infra/base-images/base-runner/llvm-symbolizer and /dev/null differ
diff --git a/infra/base-images/msan-builder/Dockerfile b/infra/base-images/msan-builder/Dockerfile
index 4fe7eaa0b..5f6091a10 100644
--- a/infra/base-images/msan-builder/Dockerfile
+++ b/infra/base-images/msan-builder/Dockerfile
@@ -15,7 +15,6 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-msan-builder
-MAINTAINER ochang@google.com
 ENV PYTHONUNBUFFERED 1
 RUN msan_build.py --work-dir=$WORK \
     libarchive13 \