diff --git a/sel4test-hw/builds.yml b/sel4test-hw/builds.yml
index 1acac464..41e57fdb 100644
--- a/sel4test-hw/builds.yml
+++ b/sel4test-hw/builds.yml
@@ -17,3 +17,9 @@ variants:
     # domains: ['', DOM]
     compiler: [gcc, clang]
     mode: [32, 64]
+
+build-filter:
+    - arch: [arm, x86]
+    - arch: [riscv]
+      # remove riscv clang for now, until muslibc is working with clang-12
+      compiler: gcc
diff --git a/sel4test-sim/builds.yml b/sel4test-sim/builds.yml
index 762a7a6d..01936883 100644
--- a/sel4test-sim/builds.yml
+++ b/sel4test-sim/builds.yml
@@ -48,6 +48,8 @@ build-filter:
       arch: [riscv]
       # Bamboo has no "release" simulation for RISCV, and it doesn't seem to work either:
       debug: [debug]
+      # remove riscv clang for now, until muslibc is working with clang-12
+      compiler: gcc
 
 
 # A build-filter is a list of dicts. A build passes the filter if it passes any