diff --git a/Jenkinsfile b/Jenkinsfile
index ec44e53..8430173 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,11 +3,6 @@
     agent none
 
     stages {
-        stage('Prepare') {
-            steps {
-                cleanWs()
-            }
-        }
         stage('Build') {
             agent { 
 		docker {
@@ -15,9 +10,13 @@
 		}
 	    }
             steps {
+                echo 'Preparing..'
+                cleanWs()
                 echo 'Building..'
 		sh './build.sh'
 		archiveArtifacts artifacts: 'build/hello*', fingerprint: true
+                echo 'Cleaning..'
+		cleanWs cleanWhenFailure: false, cleanWhenNotBuilt: false, cleanWhenUnstable: false
             }
         }
         stage('Linting') {
@@ -54,11 +53,6 @@
                 sh 'make publish'
             }
         }
-        stage('Clean') {
-            steps {
-		cleanWs cleanWhenFailure: false, cleanWhenNotBuilt: false, cleanWhenUnstable: false
-            }
-        }
     }
 }