diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index d2dc9e6..7adb5af 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -723,7 +723,6 @@
       - 'build_voltha_pod_release_timer':
           build-node: 'dt-berlin-community-pod'
           config-pod: 'dt-berlin-pod-openonugo'
-          'disable-job': true
           release: 'master'
           branch: 'master'
           num-of-onos: '3'
@@ -741,8 +740,7 @@
       # Berlin POD test job - master versions, uses 1T8GEM tech profile and openonu go on voltha branch
       - 'build_voltha_pod_test':
           build-node: 'dt-berlin-community-pod'
-          config-pod: 'dt-berlin-pod-gpon'
-          'disable-job': true
+          config-pod: 'dt-berlin-pod-openonugo'
           name-extension: '_DT_openonugo'
           work-flow: 'DT'
           release: 'master'
diff --git a/jjb/pipeline/voltha-dt-physical-functional-tests-openonu-go.groovy b/jjb/pipeline/voltha-dt-physical-functional-tests-openonu-go.groovy
index 19a416c..4ef501e 100644
--- a/jjb/pipeline/voltha-dt-physical-functional-tests-openonu-go.groovy
+++ b/jjb/pipeline/voltha-dt-physical-functional-tests-openonu-go.groovy
@@ -23,7 +23,7 @@
     label "${params.buildNode}"
   }
   options {
-    timeout(time: 240, unit: 'MINUTES')
+    timeout(time: 60, unit: 'MINUTES')
   }
 
   environment {
@@ -163,19 +163,21 @@
         ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/dt-workflow/FunctionalTests"
       }
       steps {
-        sh """
-        cd $WORKSPACE/kind-voltha/scripts
-        ./log-collector.sh > /dev/null &
-        ./log-combine.sh > /dev/null &
+        timeout(time: 30, unit: 'MINUTES') {
+          sh """
+          cd $WORKSPACE/kind-voltha/scripts
+          ./log-collector.sh > /dev/null &
+          ./log-combine.sh > /dev/null &
 
-        mkdir -p $ROBOT_LOGS_DIR
-        if ( ${powerSwitch} ); then
-             export ROBOT_MISC_ARGS="--removekeywords wuks -i PowerSwitch -i sanityDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
-        else
-             export ROBOT_MISC_ARGS="--removekeywords wuks -e PowerSwitch -i sanityDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
-        fi
-        make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
-        """
+          mkdir -p $ROBOT_LOGS_DIR
+          if ( ${powerSwitch} ); then
+               export ROBOT_MISC_ARGS="--removekeywords wuks -i PowerSwitch -i sanityDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+          else
+               export ROBOT_MISC_ARGS="--removekeywords wuks -e PowerSwitch -i sanityDt -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
+          fi
+          make -C $WORKSPACE/voltha-system-tests voltha-dt-test || true
+          """
+        }
       }
     }
   }
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index bc4329e..f31d174 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -204,6 +204,7 @@
         apt-transport-https \
         build-essential \
         bzip2 \
+        cloud-init \
         curl \
         ebtables \
         enchant \
@@ -245,11 +246,7 @@
       python-ndg-httpsclient \
       python-requests \
       python-six \
-      python-urllib3 \
-      python3-chardet \
-      python3-requests \
-      python3-six \
-      python3-urllib3
+      python-urllib3
 
     # install python3 modules
     # upgrade pip or other installations may fail in unusual ways