diff --git a/ci/Jenkinsfile.docker b/ci/Jenkinsfile.docker
index 0658364d9..60ea3633f 100644
--- a/ci/Jenkinsfile.docker
+++ b/ci/Jenkinsfile.docker
@@ -43,9 +43,10 @@ pipeline {
   stages {
     stage('Build') {
       steps { script {
+        def commitOrRef = params.GIT_REF ? params.GIT_REF.take(8) : GIT_COMMIT.take(8)
         image = docker.build(
-          "${params.IMAGE_NAME}:${params.IMAGE_TAG ?: GIT_COMMIT.take(8)}",
-          "--build-arg='GIT_COMMIT=${GIT_COMMIT.take(8)}' ."
+          "${params.IMAGE_NAME}:${params.IMAGE_TAG ?: commitOrRef}",
+          "--build-arg='GIT_COMMIT=${commitOrRef}' ."
         )
       } }
     }