diff --git a/Jenkinsfile b/Jenkinsfile
index 8dfc1d03474b6d77a6944cea28705a5cd9a9c73a..75df32646ff9c4ac70086430abb66b5290e1beb9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,7 @@
 #!/usr/bin/env groovy
 
+env.PIPELINE_VERSION = VersionNumber(versionNumberString: '${BUILD_DATE_FORMATTED,"yyyyMMdd"}.${BUILDS_TODAY_Z}')
+
 osname = 'apertis'
 
 release = "v2019dev0"
@@ -398,8 +400,7 @@ def buildImages(architecture, type, boards, debosarguments = "", image = true, s
 
             buildenv.inside("--device=/dev/kvm") {
               stage("setup ${architecture} ${type}") {
-                env.PIPELINE_VERSION = VersionNumber(versionNumberString: '${BUILD_DATE_FORMATTED,"yyyyMMdd"}.${BUILDS_TODAY_Z}')
-                  sh ("env ; mkdir -p ${PIPELINE_VERSION}/${architecture}/${type}")
+                sh ("env ; mkdir -p ${PIPELINE_VERSION}/${architecture}/${type}")
               }
 
               // Add successfully build artifacts here to know which ones we need to upload and test