diff --git a/etc/ci/upload_docs.sh b/etc/ci/upload_docs.sh
index 7fa4d463abd..dbe35b2aab6 100755
--- a/etc/ci/upload_docs.sh
+++ b/etc/ci/upload_docs.sh
@@ -14,6 +14,9 @@ set -o pipefail
 
 cd "$(dirname ${0})/../.."
 
+# Clean up any traces of previous doc builds.
+./etc/ci/clean_build_artifacts.sh
+
 env CC=gcc-5 CXX=g++-5 ./mach doc
 # etc/doc.servo.org/index.html overwrites $(mach rust-root)/doc/index.html
 # Use recursive copy here to avoid `cp` returning an error code
@@ -35,6 +38,9 @@ cp apis.html ../../target/doc/servo/
 echo "Copied apis.html."
 cd ../..
 
+# Clean up the traces of the current doc build.
+./etc/ci/clean_build_artifacts.sh
+
 echo "Starting ghp-import."
 ghp-import -n target/doc
 echo "Finished ghp-import."