diff --git a/.gitlab-ci b/.gitlab-ci
index 075aeccbcc116de5ff05de53460f5db3fd40802d..52bae4a14bf18d84ac5007db6ecd2ac4756142a1 160000
--- a/.gitlab-ci
+++ b/.gitlab-ci
@@ -1 +1 @@
-Subproject commit 075aeccbcc116de5ff05de53460f5db3fd40802d
+Subproject commit 52bae4a14bf18d84ac5007db6ecd2ac4756142a1
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8a7db89338163529523551470a4817ac084a2a6..ec8264164a18da22dc75573af19dcd9c35f5aaa9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,15 +4,16 @@
 # ---------------------------------------------------------------------------------------
 include:
   - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci'
-    ref: 075aeccbcc116de5ff05de53460f5db3fd40802d
+    ref: 52bae4a14bf18d84ac5007db6ecd2ac4756142a1
     file: 'manifest-pipeline-yocto.yml'
 
 variables:
   MANIFEST_PROJECT_ID: 1725
   MASTER_BRANCH_MANIFEST: kirkstone
-  MASTER_BRANCH_PROJECT: kirkstone
-  GITLAB_CI_REVISION: 075aeccbcc116de5ff05de53460f5db3fd40802d
-  CI_PARAM_IMAGE: seconorth-image
-  CI_PARAM_DISTRO: seconorth-wayland
-  CI_PARAM_IMAGE_FNG: fngsystem-image
-  CI_PARAM_DISTRO_FNG: seconorth-fngsystem
+  GITLAB_CI_REVISION: 52bae4a14bf18d84ac5007db6ecd2ac4756142a1
+
+generate-build-jobs:
+  variables:
+    CI_PARAM_IMAGE: seconorth-image
+    CI_PARAM_DISTRO: seconorth-wayland
+    CI_PARAM_DISTRO_FNG: seconorth-fngsystem