diff --git a/.builds/alpine.yml b/.builds/alpine.yml
index a2c909536..7eacddb92 100644
--- a/.builds/alpine.yml
+++ b/.builds/alpine.yml
@@ -1,5 +1,6 @@
 image: alpine/edge
 packages:
+  - clang
   - eudev-dev
   - ffmpeg-dev
   - glslang
@@ -24,7 +25,7 @@ sources:
 tasks:
   - setup: |
       cd wlroots
-      meson setup build --fatal-meson-warnings --default-library=both -Dauto_features=enabled -Dxcb-errors=disabled
+      CC=clang meson setup build --fatal-meson-warnings --default-library=both -Dauto_features=enabled -Dxcb-errors=disabled
   - build: |
       cd wlroots
       ninja -C build
diff --git a/.builds/archlinux.yml b/.builds/archlinux.yml
index f311bf741..077cce894 100644
--- a/.builds/archlinux.yml
+++ b/.builds/archlinux.yml
@@ -1,6 +1,5 @@
 image: archlinux
 packages:
-  - clang
   - ffmpeg
   - libinput
   - libliftoff
@@ -26,16 +25,12 @@ tasks:
   - setup: |
       cd wlroots
       CC=gcc meson setup build-gcc --fatal-meson-warnings --default-library=both -Dauto_features=enabled --prefix /usr -Db_sanitize=address,undefined
-      CC=clang meson setup build-clang --fatal-meson-warnings -Dauto_features=enabled
   - gcc: |
-      cd wlroots/build-gcc
+      cd wlroots/build
       ninja
       sudo ninja install
       cd ../tinywl
       CFLAGS="-fsanitize=address,undefined -fno-omit-frame-pointer" make
-  - clang: |
-      cd wlroots/build-clang
-      ninja
   - smoke-test: |
       cd wlroots/tinywl
       sudo modprobe vkms