diff --git a/documentation/tools/build-docs-container b/documentation/tools/build-docs-container
index 831d357fb..47320e182 100755
--- a/documentation/tools/build-docs-container
+++ b/documentation/tools/build-docs-container
@@ -60,6 +60,7 @@ main ()
   fi
 
   local image="$1"
+  local orig_image=$image
   shift
 
   OCI=$(which "$CONTAINERCMD")
@@ -159,6 +160,7 @@ main ()
     --volume="$DOCS_DIR:/docs:rw"
     --workdir=/docs
     --security-opt label=disable
+    --env BUILDDIR="_build-$orig_image-$image_sha"
   )
 
   if [ "$OCI" = "docker" ]; then