diff --git a/Jenkinsfile b/Jenkinsfile
index 9ea1d6fb93..b4c23f20a0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,7 +62,15 @@ pipeline {
     }
     post {
         always {
-            cleanWs()
+            echo "Finished, deleting directory."
+            deleteDir()
+        }
+        cleanup {
+            echo "Clean up in post."
+            cleanWs(cleanWhenNotBuilt: false,
+                    deleteDirs: true,
+                    disableDeferredWipeout: true,
+                    notFailBuild: true)
         }
     }
 }