diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index 5f5df69f..a8e5a7a6 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -57,16 +57,16 @@ tasks:
       reuse lint
   - push_to_gh_mirror: |
       cd muon
-      .builds/push_to_gh_mirror.sh
+      tools/ci/push_to_gh_mirror.sh
   - kickoff_custom_ci: |
       cd muon
-      .builds/solaris11.sh submit
+      tools/ci/solaris11.sh submit
   - build_gcc: |
       cd muon
-      CC=gcc .builds/fullbootstrap.sh -Dbuildtype=release -Dstatic=true -Dwebsite=true
+      CC=gcc tools/ci/fullbootstrap.sh -Dbuildtype=release -Dstatic=true -Dwebsite=true
   - build_tcc: |
       cd muon
-      CC=tcc .builds/bootstrap.sh build-tcc
+      CC=tcc tools/ci/bootstrap.sh build-tcc
   - test_gcc: |
       cd muon/build
       CC=gcc ./muon test -j$(nproc) -d dots
@@ -85,13 +85,13 @@ tasks:
       samu -C build-small
   - release: |
       cd muon
-      .builds/git_archive_with_samurai.sh muon-edge+samurai
-      .builds/prepare_release_docs.sh build
-      .builds/prepare_binary.sh build edge-amd64-linux-static
-      .builds/prepare_binary.sh build-small edge-amd64-linux-static-small
-      .builds/deploy.sh / -r --delete build/doc/website
-      .builds/deploy.sh /releases/edge -r --delete build/doc/docs
-      .builds/deploy.sh /releases/edge \
+      tools/ci/git_archive_with_samurai.sh muon-edge+samurai
+      tools/ci/prepare_release_docs.sh build
+      tools/ci/prepare_binary.sh build edge-amd64-linux-static
+      tools/ci/prepare_binary.sh build-small edge-amd64-linux-static-small
+      tools/ci/deploy.sh / -r --delete build/doc/website
+      tools/ci/deploy.sh /releases/edge -r --delete build/doc/docs
+      tools/ci/deploy.sh /releases/edge \
         build/muon-edge-amd64-linux-static \
         build/muon-edge-amd64-linux-static.md5 \
         build-small/muon-edge-amd64-linux-static-small \
diff --git a/.builds/netbsd.yml b/.builds/netbsd.yml
index 193ac37a..4e28f9e9 100644
--- a/.builds/netbsd.yml
+++ b/.builds/netbsd.yml
@@ -14,7 +14,7 @@ tasks:
       cd muon
       # TODO remove this when we implement rpaths
       export LD_LIBRARY_PATH=/usr/pkg/lib
-      .builds/fullbootstrap.sh
+      tools/ci/fullbootstrap.sh
   - test: |
       cd muon/build
       # TODO remove this when we implement rpaths
diff --git a/.builds/bootstrap.sh b/tools/ci/bootstrap.sh
similarity index 100%
rename from .builds/bootstrap.sh
rename to tools/ci/bootstrap.sh
diff --git a/.builds/deploy.sh b/tools/ci/deploy.sh
similarity index 100%
rename from .builds/deploy.sh
rename to tools/ci/deploy.sh
diff --git a/.builds/fullbootstrap.sh b/tools/ci/fullbootstrap.sh
similarity index 87%
rename from .builds/fullbootstrap.sh
rename to tools/ci/fullbootstrap.sh
index a29241fa..6d02f565 100755
--- a/.builds/fullbootstrap.sh
+++ b/tools/ci/fullbootstrap.sh
@@ -4,7 +4,7 @@
 
 set -eux
 
-.builds/bootstrap.sh build
+tools/ci/bootstrap.sh build
 
 # enable samurai wrap
 build/muon setup -Dsamurai=enabled "$@" build
diff --git a/.builds/git_archive_with_samurai.sh b/tools/ci/git_archive_with_samurai.sh
similarity index 100%
rename from .builds/git_archive_with_samurai.sh
rename to tools/ci/git_archive_with_samurai.sh
diff --git a/.builds/prepare_binary.sh b/tools/ci/prepare_binary.sh
similarity index 100%
rename from .builds/prepare_binary.sh
rename to tools/ci/prepare_binary.sh
diff --git a/.builds/prepare_release_docs.sh b/tools/ci/prepare_release_docs.sh
similarity index 100%
rename from .builds/prepare_release_docs.sh
rename to tools/ci/prepare_release_docs.sh
diff --git a/.builds/push_to_gh_mirror.sh b/tools/ci/push_to_gh_mirror.sh
similarity index 100%
rename from .builds/push_to_gh_mirror.sh
rename to tools/ci/push_to_gh_mirror.sh
diff --git a/.builds/solaris11.sh b/tools/ci/solaris11.sh
similarity index 97%
rename from .builds/solaris11.sh
rename to tools/ci/solaris11.sh
index 42db637c..c546e4d3 100755
--- a/.builds/solaris11.sh
+++ b/tools/ci/solaris11.sh
@@ -32,7 +32,7 @@ build() {
 }
 
 submit() {
-	cat .builds/solaris11.sh | ssh \
+	cat tools/ci/solaris11.sh | ssh \
 		-oPubkeyAcceptedKeyTypes=+ssh-rsa \
 		-oStrictHostKeyChecking=no \
 		-oHostKeyAlgorithms=ssh-rsa \