diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml
index b31ccb0a9..471a4d67a 100644
--- a/.github/workflows/build-template.yml
+++ b/.github/workflows/build-template.yml
@@ -30,6 +30,7 @@ env:
   POKY_URL: https://git.yoctoproject.org/poky
   DISTRO: poky
   TCLIBC: glibc musl
+  KERNELS: linaro-qcomlt yocto
 
 jobs:
   build:
@@ -77,10 +78,20 @@ jobs:
         EOF
         done
 
+        for kernel in ${KERNELS}; do
+        cat << EOF >> plan.yaml
+        ${kernel}: &${kernel}
+          local_conf:
+            - PREFERRED_PROVIDER_virtual/kernel := 'linux-${kernel}'
+
+        EOF
+        done
+
         cat << EOF >> plan.yaml
         jobs:
         EOF
 
+        # FIXME: loop over kernels instead of hardcoding them, need to support armv7a and modem first
         for tclibc in ${TCLIBC}; do
         cat << EOF >> plan.yaml
         - name: ${tclibc}
@@ -88,10 +99,16 @@ jobs:
         EOF
         for machine in ${{inputs.machines}}; do
         cat << EOF >> plan.yaml
-            - { <<: [*commondata, *${tclibc}], machine: ${machine}, name: ${machine}-${tclibc} }
+            - { <<: [*commondata, *${tclibc}, *linaro-qcomlt], machine: ${machine}, name: ${machine}-${tclibc} }
+        EOF
+        if [ "${machine}" = "qcom-armv8a" ] ; then
+        cat << EOF >> plan.yaml
+            - { <<: [*commondata, *${tclibc}, *yocto], machine: qcom-armv8a, name: qcom-armv8a-${tclibc}-yocto }
         EOF
+        fi
         done
         done
+
         echo "Ready to submit this Tux Plan:"
         cat plan.yaml
     - name: Run build