diff --git a/manifest-pipeline-yocto.yml b/manifest-pipeline-yocto.yml
index a3fad6c1887945ee9ec89bcda242df7d5d90c124..5adc56fb286d2705f5303249a1b08de406c92c4c 100644
--- a/manifest-pipeline-yocto.yml
+++ b/manifest-pipeline-yocto.yml
@@ -28,16 +28,17 @@ variables:
 
 generate-build-jobs:
   variables:
-    # Default image and distro
-    CI_PARAM_IMAGE: guf-image
-    CI_PARAM_DISTRO: guf-wayland
-
-    # Flash-N-Go image and distro
-    # In the past, the buildfng job overwrote the image and distro itself. Due to the
-    # transition to the new seconorth names, image and distro for the buildfng must be
-    # settable from outside of the job.
-    CI_PARAM_IMAGE_FNG: fngsystem-image
-    CI_PARAM_DISTRO_FNG: guf-fngsystem
-
     # List of machines to build images for
     CI_PARAM_MACHINES: imx6guf imx6ullguf imx8mguf imx8mpguf
+  parallel:
+    matrix: &build_jobs
+      # Default image and distro
+      - CI_PARAM_DISTRO: guf-wayland
+        CI_PARAM_IMAGE: guf-image
+      # Flash-N-Go image and distro
+      - CI_PARAM_DISTRO: guf-fngsystem
+        CI_PARAM_IMAGE: fngsystem-image
+
+build-jobs:
+  parallel:
+    matrix: *build_jobs
diff --git a/manifest-pipeline.yml b/manifest-pipeline.yml
index 88f79343bd2e68fdee67b8ed0a762e02e5a51f5e..f48cff434ba603742d55fb8216e31c88b9bf1e11 100644
--- a/manifest-pipeline.yml
+++ b/manifest-pipeline.yml
@@ -79,7 +79,8 @@ generate-build-jobs:
 build-jobs:
   extends:
     - .full_build_pipeline
-  needs: ["generate-build-jobs"]
+  dependencies:
+    - "generate-build-jobs: [${CI_PARAM_DISTRO}, ${CI_PARAM_IMAGE}]"
   trigger:
     include:
       - artifact: build-jobs.yml