diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c4dd1d5d45a82420a3adf58e75157d5e211ba97..39d007692db358e38a7b0aa6874a7105d5dcb8fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ build:
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.vereign.com
   script:
-    - docker build --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $TEST_IMAGE -f Dockerfile .
+    - docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg CI_JOB_TOKEN=$CI_JOB_TOKEN --pull -t $TEST_IMAGE -f Dockerfile .
     - docker push $TEST_IMAGE
     - docker tag $TEST_IMAGE $TEST_IMAGE_SHA
     - docker push $TEST_IMAGE_SHA
diff --git a/Dockerfile b/Dockerfile
index e7b316013ab7663380460a72548a4a180384d01b..b621ec90edbce589ae82b51946b1da2cf2a88086 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,8 @@ ENV SERVER_PKG_BUILD ${PKG}
 
 ARG CI_JOB_TOKEN
 ARG CI_PROJECT_NAME
+ARG CI_COMMIT_REF_NAME
+ARG CI_COMMIT_SHA
 
 ENV CI_PROJECT_NAME ${CI_PROJECT_NAME} 
 
diff --git a/Makefile b/Makefile
index 46b3fdbfbb9d2747a4fa7b9003a26e07cbc8181e..d005b54a8455bc6c484a39014cb90c0ef6aefe8f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,7 @@ SERVER_OUT := "bin/server"
 PKG := "code.vereign.com/code/key-storage-agent"
 SERVER_PKG_BUILD := "${PKG}"
 PKG_LIST := $(shell go list ${PKG}/... | grep -v /vendor/)
-BRANCH := $(shell git branch | grep \* | cut -d ' ' -f2)
-COMMIT := $(shell git branch | git describe --always --long --dirty)
-VER := $(BRANCH).$(COMMIT)
+VER := $(CI_COMMIT_REF_NAME).$(CI_COMMIT_SHA)
 
 .PHONY: all api server