diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fe03d58..72f296d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,9 +10,9 @@ build-master:
   stage: "build"
   script:
     - "docker build --pull \
-        --build-arg VCS_REF=`git rev-parse HEAD` \
+        --build-arg VCS_REF=\"${CI_COMMIT_SHA}\" \
         --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
-        --build-arg VERSION=`git describe --tags --exact-match || git rev-parse HEAD` \
+        --build-arg VERSION=\"NotAvailable\" \
         -t \"$CI_REGISTRY_IMAGE\" ."
     - "docker push \"$CI_REGISTRY_IMAGE\""
   only:
@@ -22,9 +22,9 @@ build:
   stage: "build"
   script:
     - "docker build --pull \
-        --build-arg VCS_REF=`git rev-parse HEAD` \
+        --build-arg VCS_REF=\"${CI_COMMIT_SHA}\" \
         --build-arg BUILD_DATE=`date -u +”%Y-%m-%dT%H:%M:%SZ”` \
-        --build-arg VERSION=`git describe --tags --exact-match || git rev-parse HEAD` \
+        --build-arg VERSION=\"NotAvailable\" \
         -t \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\" ."
     - "docker push \"$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG\""
   except: