diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a79bda0c597c7c3e9d6a714c3a8ad71c5c325226..f0720c907b45decf4a56a14a9504044f8513610f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,13 @@
+variables:
+  VERSION: ${CI_COMMIT_TAG}
+
 before_script:
   - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
 #php-7.0:
 #  stage: build
 #  script:
-#    - docker build --pull --build-arg ALPINE_VERSION=3.5 --build-arg PHP_VERSION=7.0 -t $CI_REGISTRY_IMAGE:php-7.0 .
+#    - docker build --pull --build-arg ALPINE_VERSION=3.5 --build-arg PHP_VERSION=7.0 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.0 .
 #    - docker push $CI_REGISTRY_IMAGE:php-7.0
 #  only:
 #    - master
@@ -12,7 +15,7 @@ before_script:
 #php-7.1:
 #  stage: build
 #  script:
-#    - docker build --pull --build-arg ALPINE_VERSION=3.7 --build-arg PHP_VERSION=7.1 -t $CI_REGISTRY_IMAGE:php-7.1 .
+#    - docker build --pull --build-arg ALPINE_VERSION=3.7 --build-arg PHP_VERSION=7.1 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.1 .
 #    - docker push $CI_REGISTRY_IMAGE:php-7.1
 #  only:
 #    - master
@@ -20,7 +23,7 @@ before_script:
 php-7.2:
   stage: build
   script:
-    - docker build --pull --build-arg ALPINE_VERSION=3.8 --build-arg PHP_VERSION=7.2 -t $CI_REGISTRY_IMAGE:php-7.2 .
+    - docker build --pull --build-arg ALPINE_VERSION=3.8 --build-arg PHP_VERSION=7.2 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.2 .
     - docker push $CI_REGISTRY_IMAGE:php-7.2
   only:
     - master
@@ -28,7 +31,7 @@ php-7.2:
 php-7.3:
   stage: build
   script:
-    - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_VERSION=7.3 -t $CI_REGISTRY_IMAGE:php-7.3 .
+    - docker build --pull --build-arg ALPINE_VERSION=3.11 --build-arg PHP_VERSION=7.3 --build-arg VERSION=${VERSION} -t $CI_REGISTRY_IMAGE:php-7.3 .
     - docker push $CI_REGISTRY_IMAGE:php-7.3
   only:
     - master
diff --git a/Dockerfile b/Dockerfile
index 4213350cf52754499f821a1648a602367528bc07..f71c944b6d837feff369044c3c7e850ddb8ccf9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM alpine:${ALPINE_VERSION}
 
 LABEL com.example.vendor="LakeDrops" \
       maintainer="juergen.haas@lakedrops.com" \
+      version="${VERSION}" \
       description="An image for GitLab runner to build and test Drupal projects."
 
 ARG ALPINE_VERSION