diff --git a/TagJenkinsfile b/TagJenkinsfile
index c69c7d6e7..673ae6cf7 100644
--- a/TagJenkinsfile
+++ b/TagJenkinsfile
@@ -29,15 +29,15 @@ pipeline {
                     // Use a scripted pipeline.
                     script {
                             stage('Push image') {
-                                sh "echo ${BUILD_TAG}"
+                                sh "echo ${$TAG_NAME}"
                                 sh "docker login --username=${dockerUser} --password=${dockerPassword}"
                                 sh '''
                                 make -C bridge docker
                                 make -C coordinator docker
-                                docker tag scrolltech/bridge:${BUILD_TAG}
-                                docker tag scrolltech/coordinator:${BUILD_TAG}
-                                docker push scrolltech/bridge:${BUILD_TAG}
-                                docker push scrolltech/coordinator:${BUILD_TAG}
+                                docker tag scrolltech/bridge:${$TAG_NAME}
+                                docker tag scrolltech/coordinator:${$TAG_NAME}
+                                docker push scrolltech/bridge:${$TAG_NAME}
+                                docker push scrolltech/coordinator:${$TAG_NAME}
                                 '''
                             }                              
                     }
@@ -48,7 +48,7 @@ pipeline {
     post {
         always {
             cleanWs() 
-            slackSend(message: "${JOB_BASE_NAME} ${GIT_COMMIT} #${BUILD_TAG} Tag build ${currentBuild.result}")
+            slackSend(message: "${JOB_BASE_NAME} ${GIT_COMMIT} #${$TAG_NAME} Tag build ${currentBuild.result}")
         }
     }
 }