diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bfa06ba57c354f429fb6f94be9cc8e35bb2dae0d..684a32ffa58de5a9892d2076f88d38b4dcae8b1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,30 +1,10 @@
-image: quay.io/sheogorath/build-ah-engine
-
-stages:
-  - analyse
-  - build
-  - test
-  - tag
-  - deploy
-
-before_script:
-  - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+include:
+  local: /gitlab-ci-template.yml
 
 variables:
-  BAE_VERSION: "1.0.0"
-  SI_TOOLS_VERSION: "0.2.0"
-
-build:
-  stage: build
-  script:
-    - podman build --pull --build-arg SI_TOOLS_VERSION -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+  CONTAINER_VERSION: "1.0.0"
+  CI_REGISTRY_BUILD_ARG: "--build-arg 0.2.0"
 
-tagging-master:
-  stage: tag
-  script:
-    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-    - si-tagging -l "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE" "${BAE_VERSION}"
-    - si-push "$CI_REGISTRY_IMAGE"
+container-tagging:
   only:
     - master
diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
new file mode 100644
index 0000000000000000000000000000000000000000..06c0cc0f2e88dd36720f7eca2414884e38488ea9
--- /dev/null
+++ b/gitlab-ci-template.yml
@@ -0,0 +1,41 @@
+stages:
+  - build
+  - tag
+
+variables:
+  CI_REGISTRY_BUILD_ARGS: ""
+
+container-build:
+  stage: build
+  inherit:
+    default: false
+    variables:
+      - CI_REGISTRY
+      - CI_REGISTRY_USER
+      - CI_REGISTRY_PASSWORD
+      - CI_REGISTRY_IMAGE
+      - CI_REGISTRY_BUILD_ARGS
+  image: quay.io/sheogorath/build-ah-engine:1.0.0
+  before_script:
+    - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - podman build --pull $CI_REGISTRY_BUILD_ARGS -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA" .
+    - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
+
+container-tagging:
+  stage: tag
+  inherit:
+    default: false
+    variables:
+      - CI_REGISTRY
+      - CI_REGISTRY_USER
+      - CI_REGISTRY_PASSWORD
+      - CI_REGISTRY_IMAGE
+      - CI_REGISTRY_IMAGE_VERSION
+  image: quay.io/sheogorath/build-ah-engine:1.0.0
+  before_script:
+    - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
+    - si-tagging -l "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE" "${CI_REGISTRY_IMAGE_VERSION}"
+    - si-push "$CI_REGISTRY_IMAGE"