diff --git a/schedulers.py b/schedulers.py
index 42983a8..0018fcb 100644
--- a/schedulers.py
+++ b/schedulers.py
@@ -73,16 +73,16 @@ branchdefaults = {
     },
     'whinlatter': {
         'branch': 'whinlatter',
-        'branch_poky': 'master',
         'branch_bitbake': '2.16',
         'branch_meta-arm': 'whinlatter',
         'branch_meta-gplv2': 'master',
         'branch_meta-mingw': 'whinlatter',
         'branch_meta-openembedded': 'whinlatter',
-        'branch_meta-yocto': 'whinlatter',
-        'branch_yocto-docs': 'whinlatter',
-        'branch_oecore': 'whinlatter',
         'branch_meta-virtualization': 'whinlatter',
+        'branch_meta-yocto': 'whinlatter',
+        'branch_oecore': 'whinlatter',
+        'branch_poky': 'master',
+        'branch_yocto-docs': 'whinlatter',
     },
     'walnascar': {
         'branch': 'walnascar',
@@ -120,22 +120,22 @@ branchdefaults = {
     },
     'scarthgap': {
         'branch': 'scarthgap',
-        'branch_poky': 'scarthgap',
         'branch_bitbake': '2.8',
-        'branch_meta-arm': 'scarthgap',
         'branch_meta-agl': 'master',
+        'branch_meta-arm': 'scarthgap',
         'branch_meta-aws': 'scarthgap',
         'branch_meta-clang': 'scarthgap',
         'branch_meta-gplv2': 'master',
         'branch_meta-intel': 'scarthgap',
         'branch_meta-mingw': 'scarthgap',
         'branch_meta-openembedded': 'scarthgap',
+        'branch_meta-qt6': '6.8.1',
         'branch_meta-security': 'scarthgap',
         'branch_meta-ti': 'scarthgap',
         'branch_meta-virtualization': 'scarthgap',
-        'branch_oecore': 'scarthgap',
         'branch_meta-webosose': 'scarthgap-webos',
-        'branch_meta-qt6': '6.8.1',
+        'branch_oecore': 'scarthgap',
+        'branch_poky': 'scarthgap',
     },
     'nanbield': {
         'branch': 'nanbield',
@@ -185,22 +185,22 @@ branchdefaults = {
     },
     'kirkstone': {
         'branch': 'kirkstone',
-        'branch_poky': 'kirkstone',
         'branch_bitbake': '2.0',
-        'branch_meta-arm': 'kirkstone',
         'branch_meta-agl': 'quillback',
+        'branch_meta-arm': 'kirkstone',
         'branch_meta-aws': 'kirkstone',
         'branch_meta-clang': 'kirkstone',
         'branch_meta-gplv2': 'kirkstone',
         'branch_meta-intel': 'kirkstone',
         'branch_meta-mingw': 'kirkstone',
         'branch_meta-openembedded': 'kirkstone',
+        'branch_meta-qt6': '6.8.1',
         'branch_meta-security': 'kirkstone',
         'branch_meta-ti': 'kirkstone',
         'branch_meta-virtualization': 'kirkstone',
-        'branch_oecore': 'kirkstone',
         'branch_meta-webosose': 'kirkstone-webos',
-        'branch_meta-qt6': '6.8.1',
+        'branch_oecore': 'kirkstone',
+        'branch_poky': 'kirkstone',
     },
     'honister': {
         'branch': 'honister',