diff --git a/Jenkinsfile b/Jenkinsfile
index 293690e..975b4a9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -48,11 +48,12 @@ pipeline {
         }
       }
       steps {
-        sh 'docker build -t $IMAGE_NAME:$GIT_COMMIT -f docker/Dockerfile .'
+        def tagName = env.ref?.replaceFirst(/^refs\/tags\//, '')
+        sh "docker build -t $IMAGE_NAME:${tagName} -f docker/Dockerfile ."
         withCredentials([usernamePassword(credentialsId: "$DOCKER_CREDENTIALS_ID", usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
           sh """
             echo "$PASSWORD" | docker login $REGISTRY -u "$USERNAME" --password-stdin
-            docker push $IMAGE_NAME:$GIT_COMMIT
+            docker push $IMAGE_NAME:${tagName}
           """
         }
       }