diff --git a/master/custom/builders.py b/master/custom/builders.py
index a2012f0b..729fab0d 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -356,7 +356,6 @@ def generate_builderdefs(tags, entries):
     ("WASM Emscripten", "rkm-emscripten", EmscriptenBuild),
 
     # RISC-V 64-bit GCC/Clang
-    ("riscv64 Ubuntu", "onder-riscv64", SlowUnixInstalledBuild),
     ("RISC-V 64-bit Ubuntu", "rise-riscv64-4", SlowDebugUnixBuild),
     ("RISC-V 64-bit Ubuntu Clang", "rise-riscv64-2", SlowClangUnixBuild),
     ("RISC-V 64-bit Ubuntu NoGIL", "rise-riscv64-3", SlowUnixNoGilBuild),
@@ -498,6 +497,8 @@ def generate_builderdefs(tags, entries):
     # FreeBSD 16 is CURRENT: development branch (at 2026-01-09)
     ("AMD64 FreeBSD16", "opsec-fbsd16", UnixBuild),
 
+    # RISC-V 64-bit GCC
+    ("RISC-V 64-bit Debian", "onder-riscv64", SlowUnixInstalledBuild),
 ]))
 
 
diff --git a/master/custom/workers.py b/master/custom/workers.py
index 5eb9d265..5ef90294 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -425,7 +425,7 @@ def get_workers(settings):
         ),
         cpw(
             name="onder-riscv64",
-            tags=['linux', 'unix', 'ubuntu', 'riscv64'],
+            tags=['linux', 'unix', 'debian', 'riscv64', 'dtrace'],
             branches=BRANCHES.only_since(3, 11),
             parallel_tests=4,
         ),