diff --git a/master/custom/builders.py b/master/custom/builders.py
index 423978a9..9459f602 100644
--- a/master/custom/builders.py
+++ b/master/custom/builders.py
@@ -301,6 +301,9 @@
 
     # Solaris sparcv9
     ("SPARCv9 Oracle Solaris 11.4", "kulikjak-solaris-sparcv9", UnixBuild),
+
+    # riscv64 GCC
+    ("riscv64 Ubuntu23", "onder-riscv64", UnixBuild),
 ]
 
 
diff --git a/master/custom/workers.py b/master/custom/workers.py
index a1066a10..c67c511e 100644
--- a/master/custom/workers.py
+++ b/master/custom/workers.py
@@ -314,4 +314,10 @@ def get_workers(settings):
             parallel_tests=4,
             parallel_builders=2,
         ),
+        cpw(
+            name="onder-riscv64",
+            tags=['linux', 'unix', 'ubuntu', 'riscv64'],
+            not_branches=['3.9', '3.10'],
+            parallel_tests=4,
+        ),
     ]