diff --git a/tools/ci/cibuild.sh b/tools/ci/cibuild.sh
index ef0c54ebcdc..002eb0ddf55 100755
--- a/tools/ci/cibuild.sh
+++ b/tools/ci/cibuild.sh
@@ -148,16 +148,15 @@ function bloaty {
   add_path "${tools}"/bloaty/bin
 
   if [ ! -f "${tools}/bloaty/bin/bloaty" ]; then
-    git clone --branch main https://github.com/google/bloaty bloaty-src
-    cd bloaty-src
+    git clone --branch main https://github.com/google/bloaty "${tools}"/bloaty-src
+    cd "${tools}"/bloaty-src
     # Due to issues with latest MacOS versions use pinned commit.
     # https://github.com/google/bloaty/pull/326
     git checkout 52948c107c8f81045e7f9223ec02706b19cfa882
     mkdir -p "${tools}"/bloaty
     cmake -D BLOATY_PREFER_SYSTEM_CAPSTONE=NO -DCMAKE_SYSTEM_PREFIX_PATH="${tools}"/bloaty
     make install -j 6
-    cd "${tools}"
-    rm -rf bloaty-src
+    git clean -xfd
   fi
 
   command bloaty --version