diff --git a/lmp/jobserv.yml b/lmp/jobserv.yml
index 19ec2f68..2c5d718f 100644
--- a/lmp/jobserv.yml
+++ b/lmp/jobserv.yml
@@ -1,6 +1,6 @@
 timeout: 540  # a build with no cache is quite slow
 triggers:
-  - name: build-release
+  - name: build-eol
     type: git_poller
     email:
       users: 'ci-notifications@foundries.io'
@@ -12,16 +12,11 @@ triggers:
       GIT_URL: |
         https://github.com/foundriesio/lmp-manifest.git
       GIT_POLL_REFS: |
-        refs/heads/main
-      OTA_LITE_TAG: main
+        refs/heads/kirkstone
+      OTA_LITE_TAG: kirkstone
+      AKLITE_TAG: promoted-kirkstone
+
     runs:
-      - name: lmp-sdk
-        host-tag: amd64
-        container: foundries/dind-ci:19.03.9_b38f166
-        privileged: true
-        script-repo:
-          name: fio
-          path: lmp/build-sdk-container.sh
       # images with no OTA
       - name: "{loop}"
         container: hub.foundries.io/lmp-sdk
@@ -52,9 +47,17 @@ triggers:
               - qemuarm64-secureboot
               - raspberrypi4-64
               - raspberrypi5
+              - stm32mp15-disco
+              - stm32mp15-disco-sec
+              - stm32mp15-eval
+              - stm32mp15-eval-sec
+              - kv260
+              - vck190-versal
         params:
           IMAGE: lmp-base-console-image
           MFGTOOL_FLASH_IMAGE: lmp-base-console-image
+          EULA_stm32mp15eval: "1"
+          EULA_stm32mp15disco: "1"
         script-repo:
           name: fio
           path: lmp/build.sh
@@ -90,118 +93,44 @@ triggers:
         persistent-volumes:
           bitbake: /var/cache/bitbake
 
-      # TI mfgtool
+      # STM32 mfgtool
       - name: mfgtool-{loop}
         container: hub.foundries.io/lmp-sdk
         host-tag: amd64-partner-gcp-nocache
         loop-on:
           - param: MACHINE
             values:
-              - am62xx-evm
+              - stm32mp15-disco-sec
+              - stm32mp15-eval-sec
         params:
           DISTRO: lmp-mfgtool
-          IMAGE: ti-mfgtool-files
-          EXTRA_ARTIFACTS: "ti-mfgtool-files.tar.gz"
-        script-repo:
-          name: fio
-          path: lmp/build.sh
-        persistent-volumes:
-          bitbake: /var/cache/bitbake
-
-  - name: build-main-next
-    type: git_poller
-    email:
-      users: 'ci-notifications@foundries.io'
-    webhooks:
-      - url: https://conductor.infra.foundries.io/api/lmp/
-        only_failures: false
-        secret_name: lava-webhook-key
-    params:
-      GIT_URL: |
-        https://github.com/foundriesio/lmp-manifest.git
-      GIT_POLL_REFS: |
-        refs/heads/main-next
-      OTA_LITE_TAG: 'main-next:main'
-      AKLITE_TAG: promoted-next
-    runs:
-      # images with no OTA
-      - name: "{loop}"
-        container: hub.foundries.io/lmp-sdk
-        host-tag: amd64-partner-gcp-nocache
-        loop-on:
-          - param: MACHINE
-            values:
-              - am62xx-evm
-              - am64xx-evm
-              - beaglebone-yocto
-              - generic-arm64
-              - intel-corei7-64
-              - imx6ullevk
-              - imx6ullevk-sec
-              - imx8mm-lpddr4-evk
-              - imx8mp-lpddr4-evk
-              - imx8mn-ddr4-evk
-              - imx8mn-lpddr4-evk
-              - imx8mq-evk
-              - imx93-11x11-lpddr4x-evk
-              - jetson-orin-nano-devkit-nvme
-              - jetson-agx-xavier-devkit
-              - jetson-agx-orin-devkit
-              - qemuarm64-secureboot
-              - raspberrypi4-64
-        params:
-          IMAGE: lmp-base-console-image
-          MFGTOOL_FLASH_IMAGE: lmp-base-console-image
+          IMAGE: stm32-mfgtool-files
+          EXTRA_ARTIFACTS: "stm32-mfgtool-files.tar.gz"
         script-repo:
           name: fio
           path: lmp/build.sh
         persistent-volumes:
           bitbake: /var/cache/bitbake
 
-      # mfgtool / uuu related build files
+      # TI mfgtool
       - name: mfgtool-{loop}
         container: hub.foundries.io/lmp-sdk
         host-tag: amd64-partner-gcp-nocache
         loop-on:
           - param: MACHINE
             values:
-              - imx6ullevk
-              - imx6ullevk-sec
-              - imx8mm-lpddr4-evk
-              - imx8mp-lpddr4-evk
-              - imx8mn-ddr4-evk
-              - imx8mn-lpddr4-evk
-              - imx8mq-evk
-              - imx93-11x11-lpddr4x-evk
+              - am62xx-evm
         params:
           DISTRO: lmp-mfgtool
-          IMAGE: mfgtool-files
-          EXTRA_ARTIFACTS: "mfgtool-files.tar.gz"
-        script-repo:
-          name: fio
-          path: lmp/build.sh
-        persistent-volumes:
-          bitbake: /var/cache/bitbake
-
-      # wayland distro flavor
-      - name: build-lmp-wayland-{loop}
-        container: hub.foundries.io/lmp-sdk
-        host-tag: amd64-partner-gcp-nocache
-        loop-on:
-          - param: MACHINE
-            values:
-              - imx8mm-lpddr4-evk
-              - intel-corei7-64
-        params:
-          DISTRO: lmp-wayland
-          IMAGE: lmp-base-console-image
+          IMAGE: ti-mfgtool-files
+          EXTRA_ARTIFACTS: "ti-mfgtool-files.tar.gz"
         script-repo:
           name: fio
           path: lmp/build.sh
         persistent-volumes:
           bitbake: /var/cache/bitbake
 
-  - name: build-scarthgap
+  - name: build-lts
     type: git_poller
     email:
       users: 'ci-notifications@foundries.io'
@@ -217,6 +146,13 @@ triggers:
       OTA_LITE_TAG: 'scarthgap'
       AKLITE_TAG: promoted-scarthgap
     runs:
+      - name: lmp-sdk
+        host-tag: amd64
+        container: foundries/dind-ci:19.03.9_b38f166
+        privileged: true
+        script-repo:
+          name: fio
+          path: lmp/build-sdk-container.sh
       # images with no OTA
       - name: "{loop}"
         container: hub.foundries.io/lmp-sdk
@@ -299,57 +235,34 @@ triggers:
         persistent-volumes:
           bitbake: /var/cache/bitbake
 
-  - name: build-release-stable
+  - name: build-main
     type: git_poller
     email:
       users: 'ci-notifications@foundries.io'
+    webhooks:
+      - url: https://conductor.infra.foundries.io/api/lmp/
+        only_failures: false
+        secret_name: lava-webhook-key
     params:
       GIT_URL: |
         https://github.com/foundriesio/lmp-manifest.git
       GIT_POLL_REFS: |
-        refs/heads/kirkstone
-      OTA_LITE_TAG: 'main-stable:main'
-      AKLITE_TAG: promoted-stable
+        refs/heads/main
+      OTA_LITE_TAG: 'main'
+      AKLITE_TAG: promoted-main
     runs:
+      # images with no OTA
       - name: "{loop}"
         container: hub.foundries.io/lmp-sdk
         host-tag: amd64-partner-gcp-nocache
         loop-on:
           - param: MACHINE
             values:
-              - am62xx-evm
-              - am64xx-evm
-              - beaglebone-yocto
-              - generic-arm64
               - intel-corei7-64
-              - imx6ullevk
-              - imx6ullevk-sec
-              - imx8mm-lpddr4-evk
-              - imx8mm-lpddr4-evk-sec
-              - imx8mp-lpddr4-evk
-              - imx8mp-lpddr4-evk-sec
-              - imx8mn-ddr4-evk
-              - imx8mn-ddr4-evk-sec
-              - imx8mn-lpddr4-evk
-              - imx8mn-lpddr4-evk-sec
-              - imx8mq-evk
-              - imx93-11x11-lpddr4x-evk
-              - jetson-orin-nano-devkit-nvme
-              - jetson-agx-xavier-devkit
-              - jetson-agx-orin-devkit
               - qemuarm64-secureboot
-              - raspberrypi4-64
-              - stm32mp15-disco
-              - stm32mp15-disco-sec
-              - stm32mp15-eval
-              - stm32mp15-eval-sec
-              - kv260
-              - vck190-versal
         params:
           IMAGE: lmp-base-console-image
           MFGTOOL_FLASH_IMAGE: lmp-base-console-image
-          EULA_stm32mp15eval: "1"
-          EULA_stm32mp15disco: "1"
         script-repo:
           name: fio
           path: lmp/build.sh
@@ -366,13 +279,9 @@ triggers:
               - imx6ullevk
               - imx6ullevk-sec
               - imx8mm-lpddr4-evk
-              - imx8mm-lpddr4-evk-sec
               - imx8mp-lpddr4-evk
-              - imx8mp-lpddr4-evk-sec
               - imx8mn-ddr4-evk
-              - imx8mn-ddr4-evk-sec
               - imx8mn-lpddr4-evk
-              - imx8mn-lpddr4-evk-sec
               - imx8mq-evk
               - imx93-11x11-lpddr4x-evk
         params:
@@ -385,37 +294,18 @@ triggers:
         persistent-volumes:
           bitbake: /var/cache/bitbake
 
-      # STM32 mfgtool
-      - name: mfgtool-{loop}
-        container: hub.foundries.io/lmp-sdk
-        host-tag: amd64-partner-gcp-nocache
-        loop-on:
-          - param: MACHINE
-            values:
-              - stm32mp15-disco-sec
-              - stm32mp15-eval-sec
-        params:
-          DISTRO: lmp-mfgtool
-          IMAGE: stm32-mfgtool-files
-          EXTRA_ARTIFACTS: "stm32-mfgtool-files.tar.gz"
-        script-repo:
-          name: fio
-          path: lmp/build.sh
-        persistent-volumes:
-          bitbake: /var/cache/bitbake
-
-      # TI mfgtool
-      - name: mfgtool-{loop}
+      # wayland distro flavor
+      - name: build-lmp-wayland-{loop}
         container: hub.foundries.io/lmp-sdk
         host-tag: amd64-partner-gcp-nocache
         loop-on:
           - param: MACHINE
             values:
-              - am62xx-evm
+              - imx8mm-lpddr4-evk
+              - intel-corei7-64
         params:
-          DISTRO: lmp-mfgtool
-          IMAGE: ti-mfgtool-files
-          EXTRA_ARTIFACTS: "ti-mfgtool-files.tar.gz"
+          DISTRO: lmp-wayland
+          IMAGE: lmp-base-console-image
         script-repo:
           name: fio
           path: lmp/build.sh