diff --git a/config.py b/config.py
index 947b15f2..f68f1207 100644
--- a/config.py
+++ b/config.py
@@ -74,6 +74,7 @@ trigger_builders_wait_shared = [
     "qemuarm64", "qemuarm64-alt",
     "qemux86", "qemux86-alt",
     "qemux86-64", "qemux86-64-alt",
+    "qemuriscv64",
     "qemuarm-oecore",
     "qemux86-64-x32", "qemux86-world",
     "multilib",
@@ -94,7 +95,7 @@ trigger_builders_wait_shared = [
 ]
 
 trigger_builders_wait_quick = trigger_builders_wait_shared + [
-    "oe-selftest", "qemux86-64-ptest-fast", "qemuarm64-ptest-fast"
+    "oe-selftest", "qemux86-64-ptest-fast", "qemuarm64-ptest-fast", "qemuriscv64-ptest-fast"]
 ]
 
 trigger_builders_wait_full = trigger_builders_wait_shared + [
@@ -104,25 +105,28 @@ trigger_builders_wait_full = trigger_builders_wait_shared + [
     "meta-intel", "meta-arm", "meta-aws", "meta-agl-core", "meta-virt", "meta-qcom",
     "qemuarmv5",
     "qemuarm-tc", "qemuarm64-tc", "qemux86-tc", "qemux86-64-tc"
+    "qemuriscv64-tc", "qemuriscv64-ptest",
 ]
 
+trigger_builders_wait_quick_noriscv = [x for x in trigger_builders_wait_quick if 'riscv' not in x]
+
 trigger_builders_wait_quick_releases = {
     "master" : trigger_builders_wait_quick,
-    "styhead" : trigger_builders_wait_quick + ["qemumips", "qemumips64", "qemuppc"],
-    "scarthgap" : trigger_builders_wait_quick + ["qemumips", "qemumips64", "qemuppc"],
-    "kirkstone" : trigger_builders_wait_quick + ["edgerouter", "non-gpl", "qemumips", "qemumips64", "qemuppc"],
+    "styhead" : trigger_builders_wait_quick_noriscv + ["qemumips", "qemumips64", "qemuppc"],
+    "scarthgap" : trigger_builders_wait_quick_noriscv + ["qemumips", "qemumips64", "qemuppc"],
+    "kirkstone" : trigger_builders_wait_quick_noriscv + ["edgerouter", "non-gpl", "qemumips", "qemumips64", "qemuppc"],
 }
 
 old_arch_full = ["qemumips", "qemumips-alt", "qemumips64", "qemuppc", "qemuppc-alt", "qemumips-tc", "qemumips64-tc", "qemuppc-tc", "meta-mingw"]
-riscv = ["qemuriscv64", "qemuriscv64-tc", "qemuriscv64-ptest"]
+trigger_builders_wait_full_noriscv = [x for x in trigger_builders_wait_full if 'riscv' not in x]
 
 trigger_builders_wait_full_releases = {
-    "master" : trigger_builders_wait_full + riscv,
+    "master" : trigger_builders_wait_full,
     "whinlatter" : trigger_builders_wait_full + ["meta-mingw"],
-    "walnascar" : trigger_builders_wait_full + ["meta-mingw"],
-    "styhead" : trigger_builders_wait_full + old_arch_full,
-    "scarthgap" : trigger_builders_wait_full + old_arch_full,
-    "kirkstone" : trigger_builders_wait_full + ["edgerouter", "edgerouter-alt", "non-gpl3"] + old_arch_full,
+    "walnascar" : trigger_builders_wait_full_noriscv + ["meta-mingw"],
+    "styhead" : trigger_builders_wait_full_noriscv + old_arch_full,
+    "scarthgap" : trigger_builders_wait_full_noriscv + old_arch_full,
+    "kirkstone" : trigger_builders_wait_full_noriscv + ["edgerouter", "edgerouter-alt", "non-gpl3"] + old_arch_full,
 }
 
 trigger_builders_wait_perf = ["buildperf-debian11", "buildperf-alma8"]