diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index e286f1e..73346b9 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -43,14 +43,6 @@
     DIAGS_PROFILE="VOLTHA_PROFILE"
   }
   stages {
-    stage('Cleanup') {
-      steps {
-        sh """
-        cd $WORKSPACE/kind-voltha/
-        WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down || ./voltha down
-        """
-      }
-    }
     stage('Clone kind-voltha') {
       steps {
         checkout([
@@ -68,6 +60,14 @@
         ])
       }
     }
+    stage('Cleanup') {
+      steps {
+        sh """
+        cd $WORKSPACE/kind-voltha/
+        WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down || ./voltha down
+        """
+      }
+    }
     stage('Clone voltha-system-tests') {
       steps {
         checkout([