diff --git a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
index 000d5fe..d2a01e8 100644
--- a/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha/master/voltha-dt-physical-functional-tests.groovy
@@ -100,6 +100,23 @@
            deployment_config = readYaml file: "${configBaseDir}/${configDeploymentDir}/${configFileName}-DT.yaml"
         }
         installVoltctl("${branch}")
+        sh """
+        ps -ef | grep port-forward
+        """
+
+        sh returnStdout: false, script: '''
+        # remove orphaned port-forward from different namespaces
+        ps aux | grep port-forw | grep -v grep | awk '{print $2}' | xargs --no-run-if-empty kill -9 || true
+        '''
+        sh """
+        JENKINS_NODE_COOKIE="dontKillMe" _TAG="voltha-api" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n ${volthaNamespace} svc/voltha-voltha-api 55555:55555; done"&
+        JENKINS_NODE_COOKIE="dontKillMe" _TAG="etcd" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n ${infraNamespace} svc/voltha-infra-etcd ${params.VolthaEtcdPort}:2379; done"&
+        JENKINS_NODE_COOKIE="dontKillMe" _TAG="kafka" bash -c "while true; do kubectl port-forward --address 0.0.0.0 -n ${infraNamespace} svc/voltha-infra-kafka 9092:9092; done"&
+        ps aux | grep port-forward
+        """
+        sh """
+        ps -ef | grep port-forward
+        """
         sh returnStdout: false, script: """
         mkdir -p $WORKSPACE/bin
         # download kail
@@ -108,7 +125,6 @@
         # Default kind-voltha config doesn't work on ONF demo pod for accessing kvstore.
         # The issue is that the mgmt node is also one of the k8s nodes and so port forwarding doesn't work.
         # We should change this. In the meantime here is a workaround.
-        if [ "${params.branch}" == "master" ]; then
            set +e
 
 
@@ -119,7 +135,6 @@
            voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/db
            voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
            voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
-        fi
         """
       }
     }
@@ -132,6 +147,7 @@
       }
       steps {
         sh """
+        ps -ef | grep port-forward
         mkdir -p $ROBOT_LOGS_DIR
         if ( ${powerSwitch} ); then
              export ROBOT_MISC_ARGS="--removekeywords wuks -i 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}"
@@ -152,6 +168,7 @@
       }
       steps {
         sh """
+        ps -ef | grep port-forward
         mkdir -p $ROBOT_LOGS_DIR
         if ( ${powerSwitch} ); then
              export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalDt -i 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}"
@@ -172,6 +189,7 @@
       }
       steps {
         sh """
+        ps -ef | grep port-forward
         mkdir -p $ROBOT_LOGS_DIR
         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}"
@@ -187,6 +205,7 @@
       }
       steps {
         sh """
+        ps -ef | grep port-forward
         mkdir -p $ROBOT_LOGS_DIR
         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}"
@@ -203,6 +222,7 @@
       }
       steps {
         sh """
+        ps -ef | grep port-forward
         mkdir -p $ROBOT_LOGS_DIR
         if ( ${powerSwitch} ); then
              export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functionalDt -i 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}"
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 6442909..addb694 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -11,23 +11,23 @@
           pipeline-script: 'voltha/master/software-upgrades.groovy'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
-          aaa-version: '2.4.0'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0/aaa-app-2.4.0.oar'
-          olt-version: '4.5.0'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0/olt-app-4.5.0.oar'
-          dhcpl2relay-version: '2.5.0'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0/dhcpl2relay-app-2.5.0.oar'
-          igmpproxy-version: '2.3.0'
-          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.3.0/onos-app-igmpproxy-app-2.3.0.oar'
-          sadis-version: '5.4.0'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0/sadis-app-5.4.0.oar'
-          mcast-version: '2.4.0'
-          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
-          kafka-version: '2.7.0'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:4.0.0'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:2.0.1'
-          rw-core-image: 'voltha/voltha-rw-core:3.0.0'
+          aaa-version: '2.5.0-SNAPSHOT'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.5.0-SNAPSHOT/aaa-app-2.5.0-20210709.230755-1.oar'
+          olt-version: '5.0.0-SNAPSHOT'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.0.0-SNAPSHOT/olt-app-5.0.0-20211119.224646-1.oar'
+          dhcpl2relay-version: '2.6.0-SNAPSHOT'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.6.0-SNAPSHOT/dhcpl2relay-app-2.6.0-20210709.230656-1.oar'
+          igmpproxy-version: '2.4.0-SNAPSHOT'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.4.0-SNAPSHOT/onos-app-igmpproxy-app-2.4.0-20210730.091648-1.oar'
+          sadis-version: '5.5.0-SNAPSHOT'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.5.0-SNAPSHOT/sadis-app-5.5.0-20210709.225208-1.oar'
+          mcast-version: '2.5.0-SNAPSHOT'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.5.0-SNAPSHOT/mcast-app-2.5.0-20210709.231023-1.oar'
+          kafka-version: '2.8.0-SNAPSHOT'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.8.0-SNAPSHOT/kafka-2.8.0-20211119.231111-2.oar'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:4.1.4'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:2.1.0'
+          rw-core-image: 'voltha/voltha-rw-core:3.0.1'
           ofagent-image: 'voltha/voltha-ofagent-go:2.0.0'
           onu-image-version: 'BBSM_IMG_00002'
           onu-image-url: 'http://bbsim0:50074/images/software-image.img'
@@ -56,9 +56,9 @@
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
           kafka-version: '2.7.0'
           kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.7'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.14'
-          rw-core-image: 'voltha/voltha-rw-core:2.9.5'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.10'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.15'
+          rw-core-image: 'voltha/voltha-rw-core:2.9.6'
           ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
           onu-image-version: 'BBSM_IMG_00002'
           onu-image-url: 'http://bbsim0:50074/images/software-image.img'