diff --git a/ci/docs.sh b/ci/docs.sh
index 5efd5bf7d..a43b8bacd 100755
--- a/ci/docs.sh
+++ b/ci/docs.sh
@@ -13,24 +13,24 @@ show-green () {
 }
 
 # clone repo
-sudo git clone https://github.com/sugarlabs/sugar-toolkit-gtk3.git
+sudo -u builduser git clone https://github.com/sugarlabs/sugar-toolkit-gtk3.git
 cd sugar-toolkit-gtk3
 
 # make source
 show-green "Compiling"
-sudo ./autogen.sh --with-python3
-sudo make
+sudo -u builduser ./autogen.sh --with-python3
+sudo -u builduser make
 
 # make documentation
 show-green "Building documentation"
-sudo ./make-doc.sh
-sudo mkdir deploy
-sudo mv doc/_build/html deploy/sugar3
-sudo touch deploy/.nojekyll
+sudo -u builduser ./make-doc.sh
+sudo -u builduser mkdir deploy
+sudo -u builduser mv doc/_build/html deploy/sugar3
+sudo -u builduser touch deploy/.nojekyll
 # create an index.html so that users don't become confused
 show-green "Writing index.html"
-sudo echo "<h1>Page Moved</h1>" > deploy/index.html
-sudo echo "<p>We have moved this page to <a href=\"https://github.com/sugarlabs/sugar-docs/blob/master/README.md\">GitHub</a>.</p>" >> deploy/index.html
+sudo -u builduser echo "<h1>Page Moved</h1>" > deploy/index.html
+sudo -u builduser echo "<p>We have moved this page to <a href=\"https://github.com/sugarlabs/sugar-docs/blob/master/README.md\">GitHub</a>.</p>" >> deploy/index.html
 sudo echo "<p>How did you get here? Please <a href=\"https://github.com/sugarlabs/sugar-docs/issues\">report</a> any lingering links.</p>" >> deploy/index.html
 
 show-green "Done"