diff --git a/config/platforms.yaml b/config/platforms.yaml
index 3c3e92c4e..135fa8443 100644
--- a/config/platforms.yaml
+++ b/config/platforms.yaml
@@ -603,18 +603,90 @@ platforms:
     dtb: dtbs/renesas/r8a774a1-hihope-rzg2m-ex.dtb
     compatible: ['hoperun,hihope-rzg2-ex', 'hoperun,hihope-rzg2m', 'renesas,r8a774a1']
 
+  r8a774b1-hihope-rzg2n-ex:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r8a774b1-hihope-rzg2n-ex.dtb
+    compatible: ['hoperun,hihope-rzg2-ex', 'hoperun,hihope-rzg2n', 'renesas,r8a774b1']
+
+  r8a774c0-ek874:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r8a774c0-ek874.dtb
+    compatible: ['si-linux,cat875', 'si-linux,cat874', 'renesas,r8a774c0']
+
+  r8a774e1-hihope-rzg2h-ex:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r8a774e1-hihope-rzg2h-ex.dtb
+    compatible: ['hoperun,hihope-rzg2-ex', 'hoperun,hihope-rzg2h', 'renesas,r8a774e1']
+
   r8a779m1-ulcb:
     <<: *arm64-device
     mach: renesas
     dtb: dtbs/renesas/r8a779m1-ulcb.dtb
     compatible: ['renesas,h3ulcb', 'renesas,r8a779m1', 'renesas,r8a7795']
 
+  r9a07g043u11-smarc-rzg2ul:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a07g043u11-smarc.dtb
+    compatible: ['renesas,smarc-evk', 'renesas,r9a07g043u11', 'renesas,r9a07g043']
+
+  r9a07g044c2-smarc-rzg2lc:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a07g044c2-smarc.dtb
+    compatible: ['renesas,smarc-evk', 'renesas,r9a07g044c2', 'renesas,r9a07g044']
+
   r9a07g044l2-smarc-rzg2l:
     <<: *arm64-device
     mach: renesas
     dtb: dtbs/renesas/r9a07g044l2-smarc.dtb
     compatible: ['renesas,smarc-evk', 'renesas,r9a07g044l2', 'renesas,r9a07g044']
 
+  r9a07g054l2-smarc-rzv2l:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a07g054l2-smarc.dtb
+    compatible: ['renesas,smarc-evk', 'renesas,r9a07g054l2', 'renesas,r9a07g054']
+
+  r9a08g045s33-smarc-rzg3s:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a08g045s33-smarc.dtb
+    compatible: ['renesas,smarc2-evk', 'renesas,rzg3s-smarcm', 'renesas,r9a08g045s33', 'renesas,r9a08g045']
+
+  r9a09g047e57-smarc-rzg3e:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a09g047e57-smarc.dtb
+    compatible: ['renesas,smarc2-evk', 'renesas,rzg3e-smarcm', 'renesas,r9a09g047e57', 'renesas,r9a09g047']
+
+  r9a09g056n48-rzv2n-evk:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a09g056n48-rzv2n-evk.dtb
+    compatible: ['renesas,rzv2n-evk', 'renesas,r9a09g056n48', 'renesas,r9a09g056']
+
+  r9a09g057h44-rzv2h-evk:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a09g057h44-rzv2h-evk.dtb
+    compatible: ['renesas,rzv2h-evk', 'renesas,r9a09g057h44', 'renesas,r9a09g057']
+
+  r9a09g077m44-rzt2h-evk:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a09g077m44-rzt2h-evk.dtb
+    compatible: ['renesas,rzt2h-evk', 'renesas,r9a09g077m44', 'renesas,r9a09g077']
+
+  r9a09g087m44-rzn2h-evk:
+    <<: *arm64-device
+    mach: renesas
+    dtb: dtbs/renesas/r9a09g087m44-rzn2h-evk.dtb
+    compatible: ['renesas,rzn2h-evk', 'renesas,r9a09g087m44', 'renesas,r9a09g087']
+
   rk3399-khadas-edge-v:
     <<: *arm64-device
     mach: rockchip
diff --git a/config/scheduler.yaml b/config/scheduler.yaml
index 053480317..be0df73b9 100644
--- a/config/scheduler.yaml
+++ b/config/scheduler.yaml
@@ -191,17 +191,19 @@ scheduler:
       - rk3588-rock-5b
 
   - job: baseline-nfs-arm64
-    event: *kbuild-gcc-14-arm64-node-event
-    runtime:
+    event: &kbuild-gcc-15-arm64-node-event
+      <<: *node-event-kbuild
+      name: kbuild-gcc-15-arm64
+    runtime: &lava-renesas-runtime
       type: lava
       name: lava-renesas
     platforms:
       - r8a774a1-hihope-rzg2m-ex
     rules:
-      min_version:
+      min_version: &min-version-rzg2m
         version: 5
         patchlevel: 3
-      tree:
+      tree: &lava-renesas-trees
         - kernelci
         - mainline
         - next
@@ -210,23 +212,273 @@ scheduler:
         - stable-rc
 
   - job: baseline-nfs-arm64
-    event: *kbuild-gcc-14-arm64-node-event
-    runtime:
-      type: lava
-      name: lava-renesas
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r8a774b1-hihope-rzg2n-ex
+    rules:
+      min_version: &min-version-rzg2n
+        version: 5
+        patchlevel: 5
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r8a774c0-ek874
+    rules:
+      min_version: &min-version-rzg2e
+        version: 5
+        patchlevel: 1
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r8a774e1-hihope-rzg2h-ex
+    rules:
+      min_version: &min-version-rzg2h
+        version: 5
+        patchlevel: 9
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a07g043u11-smarc-rzg2ul
+    rules:
+      min_version: &min-version-rzg2ul
+        version: 5
+        patchlevel: 19
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a07g044c2-smarc-rzg2lc
+    rules:
+      min_version: &min-version-rzg2lc
+        version: 5
+        patchlevel: 18
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
     platforms:
       - r9a07g044l2-smarc-rzg2l
     rules:
-      min_version:
+      min_version: &min-version-rzg2l
         version: 5
         patchlevel: 16
-      tree:
-        - kernelci
-        - mainline
-        - next
-        - renesas
-        - stable
-        - stable-rc
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a07g054l2-smarc-rzv2l
+    rules:
+      min_version: &min-version-rzv2l
+        version: 5
+        patchlevel: 18
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a08g045s33-smarc-rzg3s
+    rules:
+      min_version: &min-version-rzg3s
+        version: 6
+        patchlevel: 8
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g047e57-smarc-rzg3e
+    rules:
+      min_version: &min-version-rzg3e
+        version: 6
+        patchlevel: 17
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g056n48-rzv2n-evk
+    rules:
+      min_version: &min-version-rzv2n
+        version: 6
+        patchlevel: 17
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g057h44-rzv2h-evk
+    rules:
+      min_version: &min-version-rzv2h
+        version: 6
+        patchlevel: 17
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g077m44-rzt2h-evk
+    rules:
+      min_version: &min-version-rzt2h
+        version: 6
+        patchlevel: 19
+      tree: *lava-renesas-trees
+
+  - job: baseline-nfs-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g087m44-rzn2h-evk
+    rules:
+      min_version: &min-version-rzn2h
+        version: 6
+        patchlevel: 19
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r8a774a1-hihope-rzg2m-ex
+    rules:
+      min_version: *min-version-rzg2m
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r8a774b1-hihope-rzg2n-ex
+    rules:
+      min_version: *min-version-rzg2n
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r8a774c0-ek874
+    rules:
+      min_version: *min-version-rzg2e
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r8a774e1-hihope-rzg2h-ex
+    rules:
+      min_version: *min-version-rzg2h
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a07g043u11-smarc-rzg2ul
+    rules:
+      min_version: *min-version-rzg2ul
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a07g044c2-smarc-rzg2lc
+    rules:
+      min_version: *min-version-rzg2lc
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a07g044l2-smarc-rzg2l
+    rules:
+      min_version: *min-version-rzg2l
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a07g054l2-smarc-rzv2l
+    rules:
+      min_version: *min-version-rzv2l
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a08g045s33-smarc-rzg3s
+    rules:
+      min_version: *min-version-rzg3s
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g047e57-smarc-rzg3e
+    rules:
+      min_version: *min-version-rzg3e
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g056n48-rzv2n-evk
+    rules:
+      min_version: *min-version-rzv2n
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g057h44-rzv2h-evk
+    rules:
+      min_version: *min-version-rzv2h
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g077m44-rzt2h-evk
+    rules:
+      min_version: *min-version-rzt2h
+      tree: *lava-renesas-trees
+
+  - job: baseline-arm64
+    event: *kbuild-gcc-15-arm64-node-event
+    runtime: *lava-renesas-runtime
+    platforms:
+      - r9a09g087m44-rzn2h-evk
+    rules:
+      min_version: *min-version-rzn2h
+      tree: *lava-renesas-trees
 
   - job: wifi-basic
     event: