diff --git a/expat/Dockerfile b/expat/Dockerfile
index 3f06e62b9..598f4a2c8 100644
--- a/expat/Dockerfile
+++ b/expat/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM libfuzzer/base-fuzzer
+FROM ossfuzz/base-libfuzzer
 MAINTAINER mike.aizatsky@gmail.com
 
 CMD /workspace/oss-fuzz/expat/build.sh
diff --git a/infra/base-images/Jenkinsfile b/infra/base-images/Jenkinsfile
index fa7de0d39..26e83af93 100644
--- a/infra/base-images/Jenkinsfile
+++ b/infra/base-images/Jenkinsfile
@@ -21,9 +21,9 @@ def dockerOptions="--no-cache"
 node {
   stage name: 'Build Docker Images', concurrency: 1
   git url: 'https://github.com/google/oss-fuzz/'
-  sh "docker build $dockerOptions --pull -t libfuzzer/base infra/base-images/base"
-  sh "docker build $dockerOptions -t libfuzzer/base-clang infra/base-images/base-clang"
-  sh "docker build $dockerOptions -t libfuzzer/base-libfuzzer infra/base-images/base-libfuzzer"
+  sh "docker build $dockerOptions --pull -t ossfuzz/base infra/base-images/base"
+  sh "docker build $dockerOptions -t ossfuzz/base-clang infra/base-images/base-clang"
+  sh "docker build $dockerOptions -t ossfuzz/base-libfuzzer infra/base-images/base-libfuzzer"
 
   stage name: 'Push Docker Images', concurrency: 1
     // login into docker
@@ -33,7 +33,7 @@ node {
 
     // #! is important here to disable default -x.
     sh "#!/bin/bash -e\ndocker info\ndocker version\ndocker login -u='${username}' -p='${password}'  -e='${email}' https://index.docker.io/v1/"
-    sh "docker push libfuzzer/base"
-    sh "docker push libfuzzer/base-clang"
-    sh "docker push libfuzzer/base-libfuzzer"
+    sh "docker push ossfuzz/base"
+    sh "docker push ossfuzz/base-clang"
+    sh "docker push ossfuzz/base-libfuzzer"
 }