diff --git a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
index 0023c04..2fe0a16 100644
--- a/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-2.12/bbsim-tests.groovy
@@ -272,10 +272,11 @@
 ** -----------------------------------------------------------------------
 ''')
 	    sh('''ps e -ww -A | grep "_TAG=kail-startup"''')
-	}
+	} // script
 
         // -----------------------------------------------------------------------
-        // stop logging
+	// stop logging
+	// [TODO] Replace this block with pgrep/pkill one-liner(s)	
         // -----------------------------------------------------------------------
 	sh("""
           P_IDS="\$(ps e -ww -A | grep "_TAG=kail-startup" | grep -v grep | awk '{print \$1}')"
@@ -287,6 +288,9 @@
           fi
 """)
 
+        // -----------------------------------------------------------------------
+	// Bundle onos-voltha / kail logs
+        // -----------------------------------------------------------------------
 	sh("""
 cat <<EOM
 
@@ -299,7 +303,7 @@
           rm onos-voltha-startup-combined.log
           popd
         """)
-       }
+	} // timeout(10)
 
 
         // -----------------------------------------------------------------------