diff --git a/docs/debugging.md b/docs/debugging.md
index fd4d85f9c..9a07af16d 100644
--- a/docs/debugging.md
+++ b/docs/debugging.md
@@ -10,9 +10,9 @@ $ compile                                     # run compilation manually
 
 ## Debugging Fuzzers with GDB
 
-If you decide to debug a fuzzer with gdb (which is already installed in base-debug-runner image),
+If you decide to debug a fuzzer with gdb (which is already installed in base-runner-debug image),
 you will need to start a container in privileged mode:
 
 ```bash
-docker run -ti --privileged -v /tmp/out:/out ossfuzz/base-debug-runner gdb /out/fuzzer_name
+docker run -ti --privileged -v /tmp/out:/out ossfuzz/base-runner-debug gdb /out/fuzzer_name
 ```
diff --git a/infra/base-images/all.sh b/infra/base-images/all.sh
index 66479edc4..1213331d5 100755
--- a/infra/base-images/all.sh
+++ b/infra/base-images/all.sh
@@ -19,3 +19,4 @@ docker build --pull -t ossfuzz/base $@ infra/base-images/base
 docker build -t ossfuzz/base-clang $@ infra/base-images/base-clang
 docker build -t ossfuzz/base-libfuzzer $@ infra/base-images/base-libfuzzer
 docker build -t ossfuzz/base-runner $@ infra/base-images/base-runner
+docker build -t ossfuzz/base-runner-debug $@ infra/base-images/libfuzzer-runner-debug
diff --git a/infra/base-images/base-debug-runner/Dockerfile b/infra/base-images/base-runner-debug/Dockerfile
similarity index 100%
rename from infra/base-images/base-debug-runner/Dockerfile
rename to infra/base-images/base-runner-debug/Dockerfile
diff --git a/infra/push-images/Jenkinsfile b/infra/push-images/Jenkinsfile
index ad14d0dce..51ae545ff 100644
--- a/infra/push-images/Jenkinsfile
+++ b/infra/push-images/Jenkinsfile
@@ -17,7 +17,7 @@
 // Jenkins build script to push docker images to docker repository.
 
 def images = ['ossfuzz/base', 'ossfuzz/base-clang', 'ossfuzz/base-libfuzzer',
-              'ossfuzz/base-runner']
+              'ossfuzz/base-runner', 'ossfuzz/libfuzzer-runner-debug']
 
 node() {
     docker.withRegistry('', 'docker-login') {