diff --git a/jjb/pipeline/voltha/master/bbsim-tests.groovy b/jjb/pipeline/voltha/master/bbsim-tests.groovy
index 8563507..41720cd 100644
--- a/jjb/pipeline/voltha/master/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/master/bbsim-tests.groovy
@@ -221,16 +221,16 @@
     aborted {
       get_pods_info("$WORKSPACE/failed")
       sh """
-      kubectl logs app.kubernetes.io/part-of=voltha | tee $WORKSPACE/failed/voltha.log
+      kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.log
       """
-      archiveArtifacts artifacts: '*.log,**/*.log'
+      archiveArtifacts artifacts: '**/*.log,**/*.txt'
     }
     failure {
       get_pods_info("$WORKSPACE/failed")
       sh """
-      kubectl logs app.kubernetes.io/part-of=voltha | tee $WORKSPACE/failed/voltha.logs
+      kubectl logs -n voltha -l app.kubernetes.io/part-of=voltha > $WORKSPACE/failed/voltha.logs
       """
-      archiveArtifacts artifacts: '*.log,**/*.log'
+      archiveArtifacts artifacts: '**/*.log,**/*.txt'
     }
     always {
       sh '''
diff --git a/vars/loadToKind.groovy b/vars/loadToKind.groovy
index 7df6bc5..379b9f3 100644
--- a/vars/loadToKind.groovy
+++ b/vars/loadToKind.groovy
@@ -28,7 +28,7 @@
     println "Loading image ${image} on Kind cluster ${cfg.name}"
 
     sh """
-      kind load docker-image ${image}:citest --name ${cfg.name} --nodes ${cfg.name}-worker,${cfg.name}-worker2
+      kind load docker-image ${image}:citest --name ${cfg.name} --nodes ${cfg.name}-control-plane,${cfg.name}-worker,${cfg.name}-worker2
     """
   }
 }