diff --git a/config.py b/config.py
index a3489ec..a655555 100644
--- a/config.py
+++ b/config.py
@@ -121,9 +121,10 @@ trigger_builders_wait_quick_releases = {
 }
 
 old_arch_full = ["qemumips", "qemumips-alt", "qemumips64", "qemuppc", "qemuppc-alt", "qemumips-tc", "qemumips64-tc", "qemuppc-tc"]
+riscv = ["qemuriscv64", "qemuriscv64-tc", "qemuriscv64-ptest"]
 
 trigger_builders_wait_full_releases = {
-    "master" : trigger_builders_wait_full + ["meta-clang"],
+    "master" : trigger_builders_wait_full + ["meta-clang"] + riscv,
     "walnascar" : trigger_builders_wait_full + ["meta-clang"],
     "styhead" : trigger_builders_wait_full + old_arch_full,
     "scarthgap" : trigger_builders_wait_full + old_arch_full,
@@ -144,7 +145,6 @@ builders_others = [
     "check-layer-nightly",
     "metrics", "indexing", "metrics-gitstats",
     "qemuriscv32", "qemuriscv32-tc",
-    "qemuriscv64", "qemuriscv64-ptest", "qemuriscv64-tc",
     "qemuppc64", "qemuppc64-tc",
     "qemux86-ptest", "qemux86-ptest-fast",
     "qemux86-musl-ptest", "qemux86-64-musl-ptest", "qemuarm64-musl-ptest",
@@ -162,7 +162,7 @@ builders_others = [
     "oe-selftest-ubuntu", "oe-selftest-centos", "oe-selftest-opensuse",
     "non-gpl3",
     "meta-webosose"
-] + old_arch_full
+] + old_arch_full + riscv
 
 subbuilders = list(set(trigger_builders_wait_quick + trigger_builders_wait_full + trigger_builders_wait_perf + builders_others))
 builders = ["a-quick", "a-full", "docs"] + subbuilders