diff --git a/config.py b/config.py
index 7e13d3b..80b7fd9 100644
--- a/config.py
+++ b/config.py
@@ -112,6 +112,7 @@ trigger_builders_wait_full = trigger_builders_wait_shared + [
 
 trigger_builders_wait_quick_releases = {
     "master" : trigger_builders_wait_quick + ["qemuriscv64"],
+    "scarthgap" : trigger_builders_wait_quick + ["qemuriscv64"],
     "zeus" : trigger_builders_wait_quick + ["mpc8315e-rdb"],
     "thud" : trigger_builders_wait_quick + ["mpc8315e-rdb"],
     "sumo" : trigger_builders_wait_quick + ["mpc8315e-rdb"]
@@ -119,6 +120,7 @@ trigger_builders_wait_quick_releases = {
 
 trigger_builders_wait_full_releases = {
     "master" : trigger_builders_wait_full + ["qemuriscv64"],
+    "scarthgap" : trigger_builders_wait_full + ["qemuriscv64"],
     "zeus" : trigger_builders_wait_full + ["mpc8315e-rdb-alt"],
     "thud" : trigger_builders_wait_full + ["mpc8315e-rdb-alt"],
     "sumo" : trigger_builders_wait_shared + ["qemumips-alt", "edgerouter-alt", "mpc8315e-rdb-alt", "qemuppc-alt", "qemux86-world-alt",
@@ -183,6 +185,7 @@ all_workers = workers + workers_bringup + workers_buildperf + workers_arm
 
 # Worker filtering for older releases
 workers_prev_releases = {
+    "scarthgap" : ("alma8", "alma9", "debian11", "debian12", "fedora38", "opensuse154", "rocky9", "stream8", "ubuntu1804", "ubuntu2004","ubuntu2204", "ubuntu2304", "perf-"),
     "nanbield" : ("alma8", "alma9", "debian11", "debian12", "fedora37", "fedora38", "opensuse153", "opensuse154", "rocky9", "stream8", "ubuntu1804", "ubuntu2004","ubuntu2204", "ubuntu2304", "perf-"),
     "mickledore" : ("alma8", "alma9", "debian10", "debian11", "fedora35", "fedora36", "fedora37", "fedora38", "opensuse153", "opensuse154", "ubuntu1804", "ubuntu2004","ubuntu2204", "perf-"),
     "langdale" : ("alma8", "alma9", "debian10", "debian11", "fedora35", "fedora36", "opensuse153", "opensuse154", "ubuntu1804", "ubuntu2004","ubuntu2204", "perf-"),
diff --git a/schedulers.py b/schedulers.py
index cde2c30..a30383f 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -63,6 +63,21 @@ branchdefaults = {
         'branch_meta-openembedded': 'master',
         'branch_oecore': 'master',
     },
+    'scarthgap': {
+        'branch': 'scarthgap',
+        'branch_poky': 'scarthgap',
+        'branch_bitbake': '2.8',
+        'branch_meta-arm': 'master',
+        'branch_meta-agl': 'next',
+        'branch_meta-aws': 'master',
+        'branch_meta-gplv2': 'master',
+        'branch_meta-intel': 'master',
+        'branch_meta-mingw': 'scarthgap',
+        'branch_meta-openembedded': 'master',
+        'branch_meta-ti': 'master',
+        'branch_meta-virtualization': 'master',
+        'branch_oecore': 'scarthgap',
+    },
     'nanbield': {
         'branch': 'nanbield',
         'branch_poky': 'nanbield',
@@ -78,7 +93,6 @@ branchdefaults = {
         'branch_meta-virtualization': 'nanbield',
         'branch_oecore': 'nanbield',
     },
-
     'mickledore': {
         'branch': 'mickledore',
         'branch_poky': 'mickledore',
@@ -413,7 +427,7 @@ def parent_scheduler(target):
             name="branchselector",
             default="master",
             label="Release Shortcut Selector",
-            choices=["master", "master-next", "abelloni-next", "mut", "nanbield", "mickledore", "langdale", "kirkstone", "honister", "hardknott", "gatesgarth", "dunfell", "zeus", "warrior", "thud", "sumo", "rocko", "pyro", "morty"],
+            choices=["master", "master-next", "abelloni-next", "mut", "scarthgap", "nanbield", "mickledore", "langdale", "kirkstone", "honister", "hardknott", "gatesgarth", "dunfell", "zeus", "warrior", "thud", "sumo", "rocko", "pyro", "morty"],
             selectors=branchdefaults),
         util.BooleanParameter(
             name="swat_monitor",