diff --git a/Jenkinsfile b/Jenkinsfile
index 63ad81d..81c3421 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,11 +27,6 @@
             deployment_config = readYaml file: "${configRepoBaseDir}${configRepoFile}"
             pod_config = readYaml file: "${configRepoBaseDir}${deployment_config.pod_config.file_name}"
         }
-        stage ("Clean-up previous build") {
-            sh "make -C build PODCONFIG_PATH=../orchestration/profiles/automation/${deployment_config.pod_config.file_name} config"
-            sh "make -C build clean-all || true"
-            sh "rm -rf *"
-        }
         stage ('Remove old head node from known hosts') {
             sh "ssh-keygen -R ${deployment_config.head.ip}"
         }
@@ -258,6 +253,9 @@
         } catch (err) {
             currentBuild.result = 'FAILURE'
             step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
+        } finally {
+            sh "make -C build clean-all || true"
+            sh "rm -rf *"
         }
         echo "RESULT: ${currentBuild.result}"
     }