diff --git a/Jenkinsfile b/Jenkinsfile
index 5fcc501c3..b5e8cd36e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,6 +13,11 @@ pipeline {
     pollSCM 'H/15 * * * *'
   }
   stages {
+    stage('Clean Up') {
+      steps {
+        cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
+      }
+    }
     stage('JDK 11') {
       agent {
         label 'ubuntu'
@@ -25,11 +30,6 @@ pipeline {
         MAVEN_OPTS = "-Xmx1024m"
       }
       stages {
-        stage('Clean Up') {
-          steps {
-            cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-          }
-        }
         stage('Build') {
           steps {
             sh 'mvn -B package -DskipTests -DskipAssembly'
@@ -48,6 +48,11 @@ pipeline {
           }
         }
       }
+      post {
+        always {
+          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
+        }
+      }
     }
     stage('JDK 9') {
       agent {
@@ -61,11 +66,6 @@ pipeline {
         MAVEN_OPTS = "-Xmx1024m"
       }
       stages {
-        stage('Clean Up') {
-          steps {
-            cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-          }
-        }
         stage('Build') {
           steps {
             sh 'mvn -B clean package -DskipTests -DskipAssembly'
@@ -84,6 +84,11 @@ pipeline {
           }
         }
       }
+      post {
+        always {
+          cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
+        }
+      }
     }
     stage('JDK 8') {
       agent {
@@ -97,11 +102,6 @@ pipeline {
         MAVEN_OPTS = "-Xmx1024m"
       }
       stages {
-        stage('Clean Up') {
-          steps {
-            cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
-          }
-        }
         stage('Build') {
           steps {
             sh 'mvn -B clean package -DskipTests -DskipAssembly'
@@ -152,8 +152,12 @@ pipeline {
         }
       }
     }
+    post {
+      always {
+        cleanWs deleteDirs: true, patterns: [[pattern: '**/target/**', type: 'INCLUDE']]
+      }
+    }
   }
-/*
   post {
     // If this build failed, send an email to the list.
     failure {
@@ -203,5 +207,4 @@ pipeline {
       }
     }
   }
- */
-}
\ No newline at end of file
+}