diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index 4dbc6b9..e41a9a2 100755
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -186,21 +186,17 @@
       steps {
         sh '''
           # start logging
-          mkdir -p $WORKSPACE/e2e
-          _TAG=kail-e2e kail -n voltha -n default > $WORKSPACE/e2e/onos-voltha-combined.log &
+          mkdir -p $WORKSPACE/1t1gem
+          _TAG=kail-1t1gem kail -n voltha -n default > $WORKSPACE/1t1gem/onos-voltha-combined.log &
 
-          mkdir -p $ROBOT_LOGS_DIR
-          export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
+          mkdir -p $ROBOT_LOGS_DIR/1t1gem
+          export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR/1t1gem"
           export TARGET_DEFAULT=openonu-go-adapter-test
 
           make -C $WORKSPACE/voltha-system-tests \$TARGET_DEFAULT || true
 
-          export TARGET_1T8GEM=1t8gem-openonu-go-adapter-test
-
-          make -C $WORKSPACE/voltha-system-tests \$TARGET_1T8GEM || true
-
           # stop logging
-          P_IDS="$(ps e -ww -A | grep "_TAG=kail-e2e" | grep -v grep | awk '{print $1}')"
+          P_IDS="$(ps e -ww -A | grep "_TAG=kail-1t1gem" | grep -v grep | awk '{print $1}')"
           if [ -n "$P_IDS" ]; then
             echo $P_IDS
             for P_ID in $P_IDS; do
@@ -209,7 +205,27 @@
           fi
 
           # get pods information
-          kubectl get pods -o wide > $WORKSPACE/e2e/pods.txt || true
+          kubectl get pods -o wide --all-namespaces > $WORKSPACE/1t1gem/pods.txt || true
+
+          _TAG=kail-1t8gem kail -n voltha -n default > $WORKSPACE/1t8gem/onos-voltha-combined.log &
+
+          mkdir -p $ROBOT_LOGS_DIR/1t8gem
+          export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR/1t8gem"
+          export TARGET_1T8GEM=1t8gem-openonu-go-adapter-test
+
+          make -C $WORKSPACE/voltha-system-tests \$TARGET_1T8GEM || true
+
+          # stop logging
+          P_IDS="$(ps e -ww -A | grep "_TAG=kail-1t8gem" | grep -v grep | awk '{print $1}')"
+          if [ -n "$P_IDS" ]; then
+            echo $P_IDS
+            for P_ID in $P_IDS; do
+              kill -9 $P_ID
+            done
+          fi
+
+          # get pods information
+          kubectl get pods -o wide --all-namespaces > $WORKSPACE/1t8gem/pods.txt || true
         '''
       }
     }
@@ -257,7 +273,7 @@
            fi
 
            # get pods information
-           kubectl get pods -o wide > $WORKSPACE/mib/pods.txt || true
+           kubectl get pods -o wide --all-namespaces > $WORKSPACE/mib/pods.txt || true
         '''
       }
     }
@@ -322,7 +338,7 @@
            fi
 
            # get pods information
-           kubectl get pods -o wide > $WORKSPACE/dt/pods.txt || true
+           kubectl get pods -o wide --all-namespaces > $WORKSPACE/dt/pods.txt || true
            '''
       }
     }
@@ -392,7 +408,7 @@
            fi
 
            # get pods information
-           kubectl get pods -o wide > $WORKSPACE/att/pods.txt || true
+           kubectl get pods -o wide --all-namespaces > $WORKSPACE/att/pods.txt || true
            '''
       }
     }
@@ -456,7 +472,7 @@
            fi
 
            # get pods information
-           kubectl get pods -o wide > $WORKSPACE/tt/pods.txt || true
+           kubectl get pods -o wide --all-namespaces > $WORKSPACE/tt/pods.txt || true
            '''
       }
     }