diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index 259b698..f8fac10 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -38,6 +38,8 @@
     VOLTHA_LOG_LEVEL="DEBUG"
     CONFIG_SADIS="no"
     ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs -e PowerSwitch"
+    KARAF_HOME="${params.karafHome}"
+    DIAGS_PROFILE="VOLTHA_PROFILE"
   }
   stages {
 
@@ -159,8 +161,8 @@
          wget https://raw.githubusercontent.com/opennetworkinglab/onos/master/tools/package/runtime/bin/onos-diagnostics-k8s
          wget https://raw.githubusercontent.com/opennetworkinglab/onos/master/tools/package/runtime/bin/onos-diagnostics-profile
          chmod 755 onos-diagnostics-k8s
-         pod_name=$(kubectl get pods -lapp=onos-onos-classic -o name | cut -d '/' -f2 | tr '\n' ' ')
-         ./onos-diagnostics-k8s -k karaf ${pod_names}
+         pod_names=$(kubectl get pods -lapp=onos-onos-classic -o name | cut -d '/' -f2 | tr '\n' ' ')
+         ./onos-diagnostics-k8s ${pod_names}
          cp /tmp/onos-diags.tar.gz $WORKSPACE/onos-diags.tar.gz
 
          ## shut down voltha but leave kind-voltha cluster
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index 90810dd..843d915 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -38,6 +38,8 @@
     VOLTHA_LOG_LEVEL="DEBUG"
     CONFIG_SADIS="no"
     ROBOT_MISC_ARGS="-e PowerSwitch ${params.extraRobotArgs}"
+    KARAF_HOME="${params.karafHome}"
+    DIAGS_PROFILE="VOLTHA_PROFILE"
   }
   stages {
 
@@ -200,8 +202,8 @@
          wget https://raw.githubusercontent.com/opennetworkinglab/onos/master/tools/package/runtime/bin/onos-diagnostics-k8s
          wget https://raw.githubusercontent.com/opennetworkinglab/onos/master/tools/package/runtime/bin/onos-diagnostics-profile
          chmod 755 onos-diagnostics-k8s
-         pod_name=$(kubectl get pods -lapp=onos-onos-classic -o name | cut -d '/' -f2 | tr '\n' ' ')
-         ./onos-diagnostics-k8s -k karaf ${pod_names}
+         pod_names=$(kubectl get pods -lapp=onos-onos-classic -o name | cut -d '/' -f2 | tr '\n' ' ')
+         ./onos-diagnostics-k8s ${pod_names}
          cp /tmp/onos-diags.tar.gz $WORKSPACE/onos-diags.tar.gz
 
          ## shut down voltha but leave kind-voltha cluster