diff --git a/config.py b/config.py
index 4ef65f0..14358aa 100644
--- a/config.py
+++ b/config.py
@@ -76,6 +76,11 @@ trigger_builders_wait_full = trigger_builders_wait_shared + [
     "qemuarm64-ptest", "qemuarm64-ltp"
 ]
 
+trigger_builders_wait_releases = {
+    "sumo" : trigger_builders_wait_shared + ["qemumips-alt", "edgerouter-alt", "mpc8315e-rdb-alt", "qemuppc-alt", "qemux86-world-alt",
+                                             "oe-selftest-ubuntu", "oe-selftest-debian", "oe-selftest-centos"]
+}
+
 # Builders which are individually triggered
 builders_others = [
     "meta-oe", "meta-virt", "meta-intel",
diff --git a/schedulers.py b/schedulers.py
index 9887022..81c2d8e 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -2,6 +2,8 @@ from buildbot.plugins import schedulers as sched
 from buildbot.plugins import util
 from yoctoabb import config
 
+from twisted.internet import defer
+
 from yoctoabb.yocto_console_view.yocto_console_view import ReleaseSelector
 
 schedulers = []
@@ -97,12 +99,22 @@ for builder in config.subbuilders:
         properties=props_for_builder(builder),
         buttonName="Force Build"))
 
+@util.renderer
+@defer.inlineCallbacks
+def builderNamesFromConfig(props):
+    yp_branch = props.getProperty('yp_build_branch')
+
+    if yp_branch in config.trigger_builders_wait_releases:
+        return config.trigger_builders_wait_releases[yp_branch]
+
+    return config.trigger_builders_wait_full
+
 # nightly builder triggers various other builders
 wait_quick = sched.Triggerable(name="wait-quick",
                          builderNames=config.trigger_builders_wait_quick)
 schedulers.append(wait_quick)
 wait_full = sched.Triggerable(name="wait-full",
-                         builderNames=config.trigger_builders_wait_full)
+                         builderNames=builderNamesFromConfig)
 schedulers.append(wait_full)
 
 def parent_scheduler(target):