diff --git a/expat/Readme.md b/expat/Readme.md
index 9ce32234c..f285a7660 100644
--- a/expat/Readme.md
+++ b/expat/Readme.md
@@ -7,5 +7,5 @@ Building and running:
 ````bash
 # Checkout sources into ~/src/oss-fuzz & ~/src/expat
 docker build -t ossfuzz/expat expat && \
-docker run -i -v ~/src/oss-fuzz:/src/oss-fuzz -v ~/src/expat:/workspace -t ossfuzz/expat
+docker run -i -v ~/src/oss-fuzz:/src/oss-fuzz -v ~/src/expat:/src/expat -t ossfuzz/expat
 ````
diff --git a/expat/build.sh b/expat/build.sh
index e17192be8..420bea7f5 100755
--- a/expat/build.sh
+++ b/expat/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 . /env
 
-cd /workspace/expat
+cd /src/expat
 
 ./buildconf.sh
 ./configure
diff --git a/freetype2/build.sh b/freetype2/build.sh
index 81060f680..c441fe0c1 100755
--- a/freetype2/build.sh
+++ b/freetype2/build.sh
@@ -17,7 +17,7 @@
 ################################################################################
 . /env
 
-cd /workspace/
+cd /src/freetype2/
 
 ./autogen.sh
 ./configure
diff --git a/infra/base-images/base-clang/env b/infra/base-images/base-clang/env
index 6510d8f67..56bcc09dd 100644
--- a/infra/base-images/base-clang/env
+++ b/infra/base-images/base-clang/env
@@ -14,7 +14,6 @@
 # limitations under the License.
 #
 ################################################################################
-export WORKSPACE="/workspace"
 export CC="clang"
 export CXX="clang++"
 export CCC="clang++"
diff --git a/infra/base-images/base-libfuzzer/Dockerfile b/infra/base-images/base-libfuzzer/Dockerfile
index 6b1a0d115..3abd675e9 100644
--- a/infra/base-images/base-libfuzzer/Dockerfile
+++ b/infra/base-images/base-libfuzzer/Dockerfile
@@ -21,10 +21,6 @@ RUN apt-get install -y git libc6-dev
 RUN cd /src && git clone --depth 1 https://github.com/google/oss-fuzz.git
 VOLUME /src/oss-fuzz
 
-RUN mkdir /workspace
-WORKDIR /workspace
-VOLUME /workspace
-
 RUN mkdir -p /work/libfuzzer
 
 ENV sanitizer_flags="-fsanitize=address"