diff --git a/config/trees/broonie-misc.yaml b/config/trees/broonie-misc.yaml
new file mode 100644
index 000000000..53098497d
--- /dev/null
+++ b/config/trees/broonie-misc.yaml
@@ -0,0 +1,12 @@
+_anchors:
+  broonie: &broonie
+    architectures:
+      - x86_64
+      - arm64
+      - arm
+
+build_configs:
+  broonie-misc:
+    <<: *broonie
+    tree: broonie-misc
+    branch: 'for-kernelci'
diff --git a/config/trees/broonie-regmap.yaml b/config/trees/broonie-regmap.yaml
new file mode 100644
index 000000000..abdb3f059
--- /dev/null
+++ b/config/trees/broonie-regmap.yaml
@@ -0,0 +1,17 @@
+_anchors:
+  broonie: &broonie
+    architectures:
+      - x86_64
+      - arm64
+      - arm
+
+build_configs:
+  broonie-regmap:
+    <<: *broonie
+    tree: broonie-regmap
+    branch: 'for-next'
+
+  broonie-regmap-fixes:
+    <<: *broonie
+    tree: broonie-regmap
+    branch: 'for-linus'
diff --git a/config/trees/broonie-regulator.yaml b/config/trees/broonie-regulator.yaml
new file mode 100644
index 000000000..19b560952
--- /dev/null
+++ b/config/trees/broonie-regulator.yaml
@@ -0,0 +1,17 @@
+_anchors:
+  broonie: &broonie
+    architectures:
+      - x86_64
+      - arm64
+      - arm
+
+build_configs:
+  broonie-regulator:
+    <<: *broonie
+    tree: broonie-regulator
+    branch: 'for-next'
+
+  broonie-regulator-fixes:
+    <<: *broonie
+    tree: broonie-regulator
+    branch: 'for-linus'
diff --git a/config/trees/broonie-sound.yaml b/config/trees/broonie-sound.yaml
new file mode 100644
index 000000000..986a4178a
--- /dev/null
+++ b/config/trees/broonie-sound.yaml
@@ -0,0 +1,17 @@
+_anchors:
+  broonie: &broonie
+    architectures:
+      - x86_64
+      - arm64
+      - arm
+
+build_configs:
+  broonie-sound:
+    <<: *broonie
+    tree: broonie-sound
+    branch: 'for-next'
+
+  broonie-sound-fixes:
+    <<: *broonie
+    tree: broonie-sound
+    branch: 'for-linus'
diff --git a/config/trees/broonie-spi.yaml b/config/trees/broonie-spi.yaml
new file mode 100644
index 000000000..7d551a101
--- /dev/null
+++ b/config/trees/broonie-spi.yaml
@@ -0,0 +1,17 @@
+_anchors:
+  broonie: &broonie
+    architectures:
+      - x86_64
+      - arm64
+      - arm
+
+build_configs:
+  broonie-spi:
+    <<: *broonie
+    tree: broonie-spi
+    branch: 'for-next'
+
+  broonie-spi-fixes:
+    <<: *broonie
+    tree: broonie-spi
+    branch: 'for-linus'
diff --git a/config/trees/broonie.yaml b/config/trees/broonie.yaml
deleted file mode 100644
index 6d9e6c3af..000000000
--- a/config/trees/broonie.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-_anchors:
-  broonie: &broonie
-    architectures:
-      - x86_64
-      - arm64
-      - arm
-
-build_configs:
-  broonie-misc:
-    <<: *broonie
-    tree: broonie-misc
-    branch: 'for-kernelci'
-
-  broonie-regmap:
-    <<: *broonie
-    tree: broonie-regmap
-    branch: 'for-next'
-
-  broonie-regmap-fixes:
-    <<: *broonie
-    tree: broonie-regmap
-    branch: 'for-linus'
-
-  broonie-regulator:
-    <<: *broonie
-    tree: broonie-regulator
-    branch: 'for-next'
-
-  broonie-regulator-fixes:
-    <<: *broonie
-    tree: broonie-regulator
-    branch: 'for-linus'
-
-  broonie-sound:
-    <<: *broonie
-    tree: broonie-sound
-    branch: 'for-next'
-
-  broonie-sound-fixes:
-    <<: *broonie
-    tree: broonie-sound
-    branch: 'for-linus'
-
-  broonie-spi:
-    <<: *broonie
-    tree: broonie-spi
-    branch: 'for-next'
-
-  broonie-spi-fixes:
-    <<: *broonie
-    tree: broonie-spi
-    branch: 'for-linus'