diff --git a/Jenkinsfile b/Jenkinsfile
index d0d146e..a1abfc0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -227,7 +227,7 @@ PY
 
     post {
         success { archiveArtifacts artifacts: 'artifacts/*.apk,artifacts/*.sha256,artifacts/*.json', fingerprint: true }
-        always {
+        cleanup {
             script {
                 // A build can be aborted while still waiting for an executor. In that
                 // case Jenkins has no FilePath context and cleanWs would mask the