diff --git a/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
index ec2c00c..dcb8059 100644
--- a/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
@@ -162,7 +162,11 @@
                export ROBOT_MISC_ARGS="--removekeywords wuks -e PowerSwitch -i sanityDt -i functionalDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then  
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          fi
         fi
         """
       }
@@ -180,7 +184,11 @@
         if [ ${params.withFttb} = true ]; then
           export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i sanityDtFttb -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace} -v has_dataplane:False"
-          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then  
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          fi
         fi
         """
       }
@@ -203,7 +211,11 @@
                export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalDt -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then  
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          fi
         fi
         """
       }
@@ -222,7 +234,11 @@
         if [ ${params.withFttb} = false ]; then
           export ROBOT_MISC_ARGS="--removekeywords wuks -i dataplaneDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then  
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          fi
         fi
         """
       }
@@ -240,7 +256,11 @@
         if [ ${params.withFttb} = false ]; then
           export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v workflow:${params.workFlow} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then  
+            make -C $WORKSPACE/voltha-system-tests voltha-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-test || true
+          fi
         fi
         """
       }
@@ -263,7 +283,11 @@
                export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalDt -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then  
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          fi
         fi
         """
       }
@@ -282,7 +306,11 @@
         if [ ${params.withFttb} = false ]; then
           export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v workflow:${params.workFlow} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then          
+            make -C $WORKSPACE/voltha-system-tests voltha-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-test || true
+          fi
         fi
         """
       }
diff --git a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
index 4470390..ffd34a2 100644
--- a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
@@ -156,7 +156,11 @@
              export ROBOT_MISC_ARGS="--removekeywords wuks -i functionalTT -e PowerSwitch -i sanityTT -i sanityTT-MCAST -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
         fi
         ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-        make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+        if [[ ${configFileName} == *"zyxel"* ]]; then          
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test
+        else
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+        fi
         """
       }
     }
@@ -177,7 +181,11 @@
                export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalTT -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel}"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then          
+            make -C $WORKSPACE/voltha-system-tests voltha-tt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+          fi
         fi
         """
       }
@@ -205,7 +213,11 @@
             export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalTT -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel} -V $ROBOT_TEST_INPUT_FILE"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then          
+            make -C $WORKSPACE/voltha-system-tests voltha-tt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+          fi
         fi
         """
       }
@@ -228,7 +240,11 @@
              export ROBOT_MISC_ARGS="--removekeywords wuks -i multicastTT -e PowerSwitch -e bbsim -e notready -d $ROBOT_LOGS_DIR -v teardown_device:False -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE -v OLT_ADAPTER_APP_LABEL:${oltAdapterAppLabel} -V $ROBOT_TEST_INPUT_FILE"
           fi
           ROBOT_MISC_ARGS+=" -v NAMESPACE:${volthaNamespace} -v INFRA_NAMESPACE:${infraNamespace}"
-          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+          if [[ ${configFileName} == *"zyxel"* ]]; then          
+            make -C $WORKSPACE/voltha-system-tests voltha-tt-test
+          else
+            make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
+          fi
         fi
         """
       }