diff --git a/builders.py b/builders.py
index 515ba62..6a61fcc 100644
--- a/builders.py
+++ b/builders.py
@@ -237,9 +237,6 @@ def get_props_set():
 
     return set_props
 
-factory.addStep(steps.Trigger(schedulerNames=['nowait'],
-                              waitForFinish=False,
-                              set_properties=get_props_set()))
 factory.addStep(steps.Trigger(schedulerNames=['wait'],
                               waitForFinish=True,
                               set_properties=get_props_set()))
diff --git a/config.py b/config.py
index 954ec47..597dadd 100644
--- a/config.py
+++ b/config.py
@@ -42,9 +42,7 @@ trigger_builders_wait = [
     "nightly-x86-64", "nightly-x86-64-lsb",
     "nightly-x86", "nightly-x86-lsb",
     "nightly-packagemanagers",
-    "nightly-rpm-non-rpm", "nightly-deb-non-deb"
-]
-trigger_builders_nowait = [
+    "nightly-rpm-non-rpm", "nightly-deb-non-deb",
     "build-appliance", "buildtools", "eclipse-plugin-neon",
     "eclipse-plugin-oxygen", "nightly-non-gpl3", "nightly-oecore",
     "nightly-world", "nightly-wic", "nightly-world-lsb",
@@ -52,7 +50,7 @@ trigger_builders_nowait = [
     "nightly-qa-extras", "nightly-oe-selftest"
 ]
 
-triggered_builders = trigger_builders_wait + trigger_builders_nowait
+triggered_builders = trigger_builders_wait
 builders = ["nightly"] + triggered_builders
 
 # Supported Yocto Project releases, by name
diff --git a/schedulers.py b/schedulers.py
index 22aea3a..67a68ad 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -85,9 +85,6 @@ for builder in config.triggered_builders:
 wait = sched.Triggerable(name="wait",
                          builderNames=config.trigger_builders_wait)
 schedulers.append(wait)
-nowait = sched.Triggerable(name="nowait",
-                           builderNames=config.trigger_builders_nowait)
-schedulers.append(nowait)
 
 schedulers.append(sched.ForceScheduler(
     name="nightly",