diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 332ead8..388db29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,8 @@
 include:
   - project: 'yourdev/gitlab-ci-templates' 
-    file: 'templates/gitlab-ci-buildpkg.yml'
-  - project: 'yourdev/gitlab-ci-templates' 
-    file: 'templates/gitlab-ci-buildpkg-host.yml'
-
-variables:
-  PKG_BUILD_SUFFIX_MODE: "short"
+    file: 
+      - 'templates/gitlab-ci-buildpkg.yml'
+      - 'templates/gitlab-ci-buildpkg-host.yml'
 
 .build-base:
   parallel:
@@ -16,3 +13,4 @@ variables:
           - ubuntu:jammy
           - ubuntu:kinetic
           - ubuntu:lunar
+          - ubuntu:mantic