diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad5024a..7102ef0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,10 @@ stages:
 variables:
   PACKAGE_PATH: "build/build.tar.gz"
 
-.before_script_template: &before_script_definition
-  before_script:
+prepare:
+  image: php:8.1
+  stage: prepare
+  script:
     - apt update -yqq
     - apt install git libpq-dev libzip-dev zip make wget gnupg -yqq
     - wget -O phive.phar https://phar.io/releases/phive.phar
@@ -19,29 +21,20 @@ variables:
     - chmod +x phive.phar
     - mv phive.phar /usr/local/bin/phive
     - phive install phpab --global --trust-gpg-keys 0x2A8299CE842DD38C
-
-prepare:
-  image: php:8.1
-  stage: prepare
-  <<: *before_script_definition
-  script:
-    - echo "Preparation completed"
   rules:
     - if: $CI_COMMIT_BRANCH
 
 build:
-  image: php:8.1
+  extends: .prepare # CHANGE: Updated to correct name if you intend to use a hidden job
   stage: build
-  <<: *before_script_definition
   script:
     - make tar
 
 package:
-  image: php:8.1
+  extends: .prepare # CHANGE: Updated to correct name if you intend to use a hidden job
   stage: package
-  <<: *before_script_definition
   script:
-    - make tar
+    - make redist
     - mkdir -p package/$CI_COMMIT_REF_NAME
     - cp $PACKAGE_PATH package/$CI_COMMIT_REF_NAME/
   artifacts:
@@ -51,11 +44,10 @@ package:
     - if: $CI_COMMIT_TAG
 
 release:
-  image: php:8.1
+  extends: .prepare # CHANGE: Updated to correct name if you intend to use a hidden job
   stage: release
-  <<: *before_script_definition
   script:
-    - make tar
+    - make redist
     - mkdir ncc_$CI_COMMIT_TAG
     - cp -r build/src/* ncc_$CI_COMMIT_TAG/
   artifacts:
@@ -72,10 +64,10 @@ ncc-docker:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
-    - docker push "$CI_REGISTRY_IMAGE${tag}"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" . # CHANGE: Updated ${tag} to $CI_COMMIT_TAG
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" # CHANGE: Updated ${tag} to $CI_COMMIT_TAG
   rules:
-    - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_BRANCH == 'dev'
+    - if: $CI_COMMIT_TAG || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_BRANCH == 'dev' # CHANGE: Added $CI_COMMIT_TAG condition
       exists:
         - Dockerfile
 
@@ -87,9 +79,9 @@ ncc-docker-debian:
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build -f Dockerfile.debian --pull -t "$CI_REGISTRY_IMAGE:debian" .
-    - docker push "$CI_REGISTRY_IMAGE:debian"
+    - docker build -f Dockerfile.debian --pull -t "$CI_REGISTRY_IMAGE:debian-$CI_COMMIT_TAG" . # CHANGE: Updated image tag format
+    - docker push "$CI_REGISTRY_IMAGE:debian-$CI_COMMIT_TAG" # CHANGE: Updated image tag format
   rules:
-    - if: $CI_COMMIT_BRANCH == 'master'
+    - if: $CI_COMMIT_TAG || $CI_COMMIT_BRANCH == 'master' # CHANGE: Added $CI_COMMIT_TAG condition
       exists:
-        - Dockerfile.debian
+        - Dockerfile.debian
\ No newline at end of file