diff --git a/jobs/Jenkinsfile_BuildAll b/jobs/Jenkinsfile_BuildAll
index 771cd0c..3fd1d3d 100644
--- a/jobs/Jenkinsfile_BuildAll
+++ b/jobs/Jenkinsfile_BuildAll
@@ -116,7 +116,7 @@ def setupEnvironment(commonHelpers) {
   def nwlBranch = "${params.BUILD_BRANCH}"
   def nwlRepoDir = "${env.YOCTO_REPO_DIR}"
   commonHelpers.gitCheckout("${env.YOCTO_REPO_URL}", nwlBranch, nwlRepoDir, true)
-  env.BUILD_IMG_JOB = "/build-yocto-target-pipeline/${env.BRANCH_NAME}"
+  env.BUILD_IMG_JOB = "/nwl-target"
 }
 
 //-----------------------------------------------------------------------------
@@ -183,7 +183,6 @@ def buildAllTargets(commonHelpers, buildBranch) {
 
   catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
     for (machine in listOfTargets) {
-      // ToDo: remove the if as soon as all machines are buildable
       if(isMachineSane(machine)) {
         Boolean isMachineSuccess = buildMachine(commonHelpers, machine, buildBranch)
         if(!isMachineSuccess && areBuildsSuccessful) {
@@ -198,4 +197,5 @@ def buildAllTargets(commonHelpers, buildBranch) {
       error("Failing build - first machine failing = ${firstMachineFailing}")
     }
   } // end catchError
+  commonHelpers.cleanupRepository("${env.YOCTO_REPO_DIR}")
 }
\ No newline at end of file