diff --git a/config.py b/config.py
index 1b14538..16a25cf 100644
--- a/config.py
+++ b/config.py
@@ -9,32 +9,32 @@ buildertorepos = {
                 "meta-mingw", "meta-gplv2"],
     "a-full": ["poky", "meta-intel", "oecore", "bitbake",
                 "meta-mingw", "meta-gplv2", "meta-arm", "meta-aws", "meta-agl", "meta-openembedded", "meta-virtualization", "meta-clang"],
-    "non-gpl3": ["poky", "meta-gplv2"],
-    "meta-mingw": ["poky", "meta-mingw"],
-    "qa-extras": ["poky", "meta-mingw"],
-    "meta-oe": ["poky", "meta-openembedded"],
-    "meta-virt": ["poky", "meta-openembedded", "meta-virtualization"],
-    "meta-intel": ["poky", "meta-intel"],
-    "meta-exein": ["poky", "meta-exein", "meta-openembedded"],
-    "meta-arm": ["poky", "meta-arm"],
-    "meta-agl-core": ["poky", "meta-agl"],
-    "meta-aws": ["poky", "meta-aws", "meta-openembedded"],
-    "meta-clang": ["poky", "meta-clang"],
-    "buildtools-docs": ["poky", "meta-openembedded"],
+    "non-gpl3": ["bitbake", "poky", "meta-gplv2"],
+    "meta-mingw": ["bitbake", "poky", "meta-mingw"],
+    "qa-extras": ["bitbake", "poky", "meta-mingw"],
+    "meta-oe": ["bitbake", "poky", "meta-openembedded"],
+    "meta-virt": ["bitbake", "poky", "meta-openembedded", "meta-virtualization"],
+    "meta-intel": ["bitbake", "poky", "meta-intel"],
+    "meta-exein": ["bitbake", "poky", "meta-exein", "meta-openembedded"],
+    "meta-arm": ["bitbake", "poky", "meta-arm"],
+    "meta-agl-core": ["bitbake", "poky", "meta-agl"],
+    "meta-aws": ["bitbake", "poky", "meta-aws", "meta-openembedded"],
+    "meta-clang": ["bitbake", "poky", "meta-clang"],
+    "buildtools-docs": ["bitbake", "poky", "meta-openembedded"],
     "qemuarm-oecore": ["oecore", "bitbake"],
-    "checkuri": ["poky"],
-    "check-layer": ["poky", "meta-mingw", "meta-gplv2"],
-    "check-layer-nightly": ["poky", "meta-agl", "meta-arm", "meta-aws", "meta-intel", "meta-openembedded", "meta-virtualization", "meta-ti", "meta-security", "meta-clang", "meta-exein", "meta-qcom"],
+    "checkuri": ["bitbake", "poky"],
+    "check-layer": ["bitbake", "poky", "meta-mingw", "meta-gplv2"],
+    "check-layer-nightly": ["bitbake", "poky", "meta-agl", "meta-arm", "meta-aws", "meta-intel", "meta-openembedded", "meta-virtualization", "meta-ti", "meta-security", "meta-clang", "meta-exein", "meta-qcom"],
     "docs": ["yocto-autobuilder-helper", "yocto-docs", "bitbake"],
-    "reproducible-meta-oe": ["poky", "meta-openembedded"],
-    "patchtest": ["poky", "meta-patchtest", "meta-openembedded"],
-    "meta-oe-mirror":  ["poky", "meta-openembedded"],
-    "auh":  ["poky", "auto-upgrade-helper"],
-    "auh-meta-oe":  ["poky", "meta-openembedded", "auto-upgrade-helper"],
-    "metrics":  ["poky", "meta-openembedded"],
-    "metrics-gitstats":  ["poky", "oecore", "bitbake", "meta-openembedded", "yocto-docs"],
-    "meta-webosose":  ["poky", "meta-clang", "meta-openembedded", "meta-qt6", "meta-webosose", "meta-security"],
-    "default": ["poky"]
+    "reproducible-meta-oe": ["bitbake", "poky", "meta-openembedded"],
+    "patchtest": ["bitbake", "poky", "meta-patchtest", "meta-openembedded"],
+    "meta-oe-mirror":  ["bitbake", "poky", "meta-openembedded"],
+    "auh":  ["bitbake", "poky", "auto-upgrade-helper"],
+    "auh-meta-oe":  ["bitbake", "poky", "meta-openembedded", "auto-upgrade-helper"],
+    "metrics":  ["bitbake", "poky", "meta-openembedded"],
+    "metrics-gitstats":  ["bitbake", "poky", "oecore", "bitbake", "meta-openembedded", "yocto-docs"],
+    "meta-webosose":  ["bitbake", "poky", "meta-clang", "meta-openembedded", "meta-qt6", "meta-webosose", "meta-security"],
+    "default": ["bitbake", "poky"]
 }
 
 # Repositories used that the scripts need to know about and should be buildbot