diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7123764e18188f91f30400716c59525b96c0c45..37f672006c672173c29ba527251c5933dc19d2d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,6 @@ stages:
   - release
   - deploy
 
-variables:
-  CI_REGISTRY_IMAGE_VERSION: "3.0.1"
-
 container-testing:
   stage: test
   image: quay.io/sheogorath/build-ah-engine:1.3.0
@@ -32,6 +29,13 @@ container-testing:
   tags:
     - amd64
 
+container-tagging:
+  stage: deploy
+  variables:
+    CI_REGISTRY_IMAGE_VERSION: "$CI_COMMIT_TAG"
+  rules:
+    - if: $CI_COMMIT_TAG
+
 deploy:
   stage: deploy
   variables:
@@ -40,7 +44,8 @@ deploy:
     project: shivering-isles/ansible-infrastructure-deploy
     strategy: depend
   rules:
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+    - if: $CI_COMMIT_TAG
+
 release:
   image:
     name: ghcr.io/go-semantic-release/semantic-release:2.20.0