diff --git a/projects/lldb-eval/Dockerfile b/projects/lldb-eval/Dockerfile
index b6a0a0467..dc61ec34d 100644
--- a/projects/lldb-eval/Dockerfile
+++ b/projects/lldb-eval/Dockerfile
@@ -14,11 +14,7 @@
 #
 ################################################################################
 
-# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04.
-# See https://github.com/google/oss-fuzz/issues/6291 for more details.
-FROM gcr.io/oss-fuzz-base/base-builder:xenial
-# Delete line above and uncomment line below to upgrade to 20.04.
-# FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder
 
 RUN apt-get update \
     && apt-get install -y wget git patchelf zlib1g-dev python libtinfo-dev --no-install-recommends
diff --git a/projects/lldb-eval/build.sh b/projects/lldb-eval/build.sh
index a8ab45df8..dee5c7cfe 100644
--- a/projects/lldb-eval/build.sh
+++ b/projects/lldb-eval/build.sh
@@ -17,7 +17,7 @@
 
 (
 cd $SRC/
-GITHUB_RELEASE="https://github.com/google/lldb-eval/releases/download/oss-fuzz-llvm-12"
+GITHUB_RELEASE="https://github.com/google/lldb-eval/releases/download/oss-fuzz-ubuntu-20.04"
 
 if [ "$SANITIZER" = "address" ]
 then