diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0944c848262c0a90620ce9628adaecb2261dc48e..1d0a2780c0bc7e21f216ee6a4608e12d1aea0351 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,25 @@
 include:
   - project: 'container-library/build-ah-engine'
     ref: feature/multiarch
-    file: '/gitlab-ci-template.yml'
+    file: '/gitlab-ci-template-manifest.yml'
+
+stages:
+  - build
+  - tag
 
 variables:
   GIT_SUBMODULE_STRATEGY: 'recursive'
-  CI_CONTAINER_BUILD_ARCHS: "amd64:arm64"
   CI_REGISTRY_IMAGE_VERSION: "0.5.2"
+
+container-build-x86_64:
+  extends: .container-build
+  tags:
+    - x86_64
+
+container-build-aarch64:
+  extends: .container-build
+  tags:
+    - aarch64
+
+container-manifest:
+  stage: tag
\ No newline at end of file