diff --git a/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
index dcb8059..ec2c00c 100644
--- a/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-dt-physical-functional-tests.groovy
@@ -162,11 +162,7 @@
                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}"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
         fi
         """
       }
@@ -184,11 +180,7 @@
         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"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
         fi
         """
       }
@@ -211,11 +203,7 @@
                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}"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
         fi
         """
       }
@@ -234,11 +222,7 @@
         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}"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
         fi
         """
       }
@@ -256,11 +240,7 @@
         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}"
-          if [[ ${configFileName} == *"zyxel"* ]]; then  
-            make -C $WORKSPACE/voltha-system-tests voltha-test
-          else
-            make -C $WORKSPACE/voltha-system-tests voltha-test || true
-          fi
+          make -C $WORKSPACE/voltha-system-tests voltha-test || true
         fi
         """
       }
@@ -283,11 +263,7 @@
                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}"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
         fi
         """
       }
@@ -306,11 +282,7 @@
         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}"
-          if [[ ${configFileName} == *"zyxel"* ]]; then          
-            make -C $WORKSPACE/voltha-system-tests voltha-test
-          else
-            make -C $WORKSPACE/voltha-system-tests voltha-test || true
-          fi
+          make -C $WORKSPACE/voltha-system-tests voltha-test || true
         fi
         """
       }
diff --git a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
index ffd34a2..4470390 100644
--- a/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/voltha-tt-physical-functional-tests.groovy
@@ -156,11 +156,7 @@
              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}"
-        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
+        make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         """
       }
     }
@@ -181,11 +177,7 @@
                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}"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         fi
         """
       }
@@ -213,11 +205,7 @@
             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}"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         fi
         """
       }
@@ -240,11 +228,7 @@
              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}"
-          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
+          make -C $WORKSPACE/voltha-system-tests voltha-tt-test || true
         fi
         """
       }
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 2fa1158..2b97cdb 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -32,7 +32,7 @@
           build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-multi-olt'
           cluster: 'pod-1.berlin-lab.lfbroadband.org'
-          disable-job: true
+          disable-job: false
           name-extension: '_DT'
           work-flow: 'DT'
           profile: '1T8GEM'
@@ -47,7 +47,7 @@
           build-node: 'jenkins-worker-01.berlin-lab'
           config-pod: 'berlin-community-pod-1-multi-olt'
           cluster: 'pod-1.berlin-lab.lfbroadband.org'
-          disable-job: true
+          disable-job: false
           release: 'master'
           branch: 'master'
           pipeline-branch: 'master'