diff --git a/Jenkinsfile b/Jenkinsfile
index 2f706a054f..eb67feb284 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,9 +32,18 @@ pipeline {
         sh script: "docker image prune -af", label: "Pruning images"
       }
     }
-    stage ('build images') {
+    stage ('refresh upstream images') {
+      when {
+        not {
+          buildingTag()
+        }
+      }
       steps {
         sh script: "make -O -j$NPROC docker_pull", label: "Ensuring fresh upstream images"
+      }
+    }
+    stage ('build images') {
+      steps {
         sh script: "make -O -j$NPROC build SCAN_IMAGES=true", label: "Building images"
       }
     }