diff --git a/jjb/cord-macros.yaml b/jjb/cord-macros.yaml
index e49239d..59cd72c 100644
--- a/jjb/cord-macros.yaml
+++ b/jjb/cord-macros.yaml
@@ -221,6 +221,8 @@
                 <permission>hudson.model.Run.Update:JenkinsPowerusers</permission>
                 <permission>hudson.model.Item.Discover:AetherAccess</permission>
                 <permission>hudson.model.Item.Discover:anonymous</permission>
+                <permission>hudson.model.Item.Discover:ONFStaff</permission>
                 <permission>hudson.model.Item.Read:AetherAccess</permission>
+                <permission>hudson.model.Item.Read:ONFStaff</permission>
                 <permission>hudson.model.Item.ViewStatus:anonymous</permission>
               </hudson.security.AuthorizationMatrixProperty>
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 4679e8c..127e3f2 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -639,7 +639,7 @@
           configurePod: true
           profile: '1T8GEM'
           reinstall-olt: false
-          openoltAdapterChart: '/home/community/adtran-2021-01-08/voltha-helm-chart-adapter-adtran-olt_v1.2.1/voltha-adapter-adtran-olt'
+          openoltAdapterChart: '/home/community/adtran-2021-01-19/voltha-adapter-adtran-olt'
           time: '9'
 
 
diff --git a/jjb/fossa.yaml b/jjb/fossa.yaml
index 38fe47e..acfa347 100644
--- a/jjb/fossa.yaml
+++ b/jjb/fossa.yaml
@@ -22,35 +22,6 @@
                   Created by {id} job-template from ci-management/jjb/fossa.yaml<br/>
                   Copyright (c) 2018-present Open Networking Foundation (ONF)
 
-#   # replace with cord-infra-gerrit-trigger-patchset when skip-vote is removed
-#   triggers:
-#     - gerrit:
-#         server-name: '{gerrit-server-name}'
-#         dependency-jobs: '{dependency-jobs}'
-#         silent-start: true
-#         trigger-on:
-#           - patchset-created-event:
-#               exclude-drafts: true
-#               exclude-trivial-rebase: false
-#               exclude-no-code-change: true
-#           - draft-published-event
-#           - comment-added-contains-event:
-#               comment-contains-value: '(?i)^.*recheck$'
-#         projects:
-#           - project-compare-type: REG_EXP
-#             project-pattern: '{project-regexp}'
-#             branches:
-#               - branch-compare-type: REG_EXP
-#                 branch-pattern: '{branch-regexp}'
-#             file-paths:
-#               - compare-type: REG_EXP
-#                 pattern: '{file-include-regexp}'
-#         skip-vote:
-#           success: true
-#           failed: true
-#           unstable: true
-#           notbuilt: true
-
     properties:
       - cord-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index d44e964..674ed2a 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -37,6 +37,9 @@
           cp-context: 'acc-dev-gcp'
           dp-context: 'ace-dev-menlo'
           log-since: '1h'
+      - 'omec-post-results':
+          pod: 'dev'
+          build-node: 'omec-ci'
       - 'omec-postmerge':
           project: '{name}'
           build-node: 'omec-ci'
@@ -45,6 +48,28 @@
           nucleus-branch-name: 'master'
           upf-branch-name: 'master'
           pipeline-file: 'omec-postmerge.groovy'
+      - 'omec-nightly':
+          pod: 'dev'
+          build-node: 'omec-ci'
+          type: 'func'
+          build-timeout: 30
+          ntl-file: 'func.ntl'
+          time: '1'
+          desc: |
+            <img src="https://jenkins.opencord.org/job/omec_func_dev/lastCompletedBuild/artifact/plots/plot.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/>
+      - 'omec-nightly':
+          pod: 'dev'
+          build-node: 'omec-ci'
+          type: 'scale'
+          build-timeout: 180
+          ntl-file: 'scale-16k-rate10.ntl'
+          time: '2'
+          desc: |
+            <img src="https://jenkins.opencord.org/job/omec_scale_dev/lastCompletedBuild/artifact/plots/attach.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/><br />
+            ----------<br />
+            <img src="https://jenkins.opencord.org/job/omec_scale_dev/lastCompletedBuild/artifact/plots/detach.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/><br />
+            ----------<br />
+            <img src="https://jenkins.opencord.org/job/omec_scale_dev/lastCompletedBuild/artifact/plots/ping.png", alt="Failed to load plot. Either a build is currently running, or the plot was not generated from the last build." width="840", height="360"/><br />
 
 # for ngic-rtc
 - project:
@@ -1004,3 +1029,154 @@
             url: 'https://github.com/{github-organization}/omec-project-ci'
             branches:
               - 'master'
+
+# OMEC nightly job
+- job-template:
+    id: 'omec-nightly'
+    name: 'omec_{type}_{pod}'
+    project-type: pipeline
+
+    description: |
+      Created from job-template {id} from ci-management/jjb/omec-ci.yaml <br />
+      {desc}
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: '{artifact-num-to-keep}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+          name: buildNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins executor node to run the job on'
+
+      - string:
+          name: testType
+          default: '{type}'
+          description: 'Type of test'
+
+      - string:
+          name: pod
+          default: '{pod}'
+          description: 'Name of OMEC POD'
+
+      - string:
+          name: timeout
+          default: '{build-timeout}'
+          description: 'Timeout period for this pipeline in minutes'
+
+      - string:
+          name: ntlFile
+          default: '{ntl-file}'
+          description: 'NG40 test automation file'
+
+      - bool:
+          name: redeploy
+          default: true
+          description: 'Redeploy OMEC before running tests if set to true'
+
+      - string:
+          name: hssdbImage
+          default: '{registry-proxy}/c3po-hssdb:master-latest'
+          description: 'Docker image for hssdb. Leave empty to use default helm-charts value'
+
+      - string:
+          name: hssImage
+          default: '{registry-proxy}/c3po-hss:master-latest'
+          description: 'Docker image for hss. Leave empty to use default helm-charts value'
+
+      - string:
+          name: mmeImage
+          default: '{registry-proxy}/nucleus:master-latest'
+          description: 'Docker image for mme. Leave empty to use default helm-charts value'
+
+      - string:
+          name: spgwcImage
+          default: '{registry-proxy}/spgw:master-latest'
+          description: 'Docker image for spgwc. Leave empty to use default helm-charts value'
+
+      - string:
+          name: bessImage
+          default: '{registry-proxy}/upf-epc-bess:master-latest'
+          description: 'Docker image for bess. Leave empty to use default helm-charts value'
+
+      - string:
+          name: zmqifaceImage
+          default: '{registry-proxy}/upf-epc-cpiface:master-latest'
+          description: 'Docker image for zmqiface. Leave empty to use default helm-charts value'
+
+      - string:
+          name: pfcpifaceImage
+          default: '{registry-proxy}/upf-epc-pfcpiface:master-latest'
+          description: 'Docker image for pfcpiface. Leave empty to use default helm-charts value'
+
+    concurrent: false
+
+    triggers:
+      - timed: |
+          TZ=America/Los_Angeles
+          H {time} * * *
+
+    pipeline-scm:
+      script-path: 'Jenkinsfile-omec-nightly.groovy'
+      scm:
+        - git:
+            url: 'https://github.com/{github-organization}/omec-project-ci'
+            branches:
+              - 'master'
+
+# OMEC post results job
+- job-template:
+    id: 'omec-post-results'
+    name: 'omec_post-results_{pod}'
+    project-type: pipeline
+
+    description: |
+      Created from job-template {id} from ci-management/jjb/omec-ci.yaml <br />
+
+    properties:
+      - cord-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+          artifact-num-to-keep: 2
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    parameters:
+      - string:
+          name: buildNode
+          default: '{build-node}'
+          description: 'Name of the Jenkins executor node to run the job on'
+
+      - string:
+          name: pod
+          default: '{pod}'
+          description: 'Name of OMEC pod'
+
+      - string:
+          name: testType
+          default: 'scale'
+          description: 'Type of test e.g. scale, func, etc.'
+
+      - string:
+          name: buildNumber
+          default: '0'
+          description: 'Build number of upstream job'
+
+    concurrent: false
+
+    pipeline-scm:
+      script-path: 'Jenkinsfile-omec-post-results.groovy'
+      scm:
+        - git:
+            url: 'https://github.com/{github-organization}/omec-project-ci'
+            branches:
+              - 'master'
diff --git a/jjb/pipeline/omec-postmerge.groovy b/jjb/pipeline/omec-postmerge.groovy
index d901418..aaac1b7 100644
--- a/jjb/pipeline/omec-postmerge.groovy
+++ b/jjb/pipeline/omec-postmerge.groovy
@@ -61,13 +61,13 @@
     stage ("Get Image Tags"){
       steps {
         script {
-          hssdb_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hssdb/tags/' | jq '.results[] | select(.name | test("${c3poBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
-          hss_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hss/tags/' | jq '.results[] | select(.name | test("${c3poBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
-          mme_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/nucleus/tags/' | jq '.results[] | select(.name | test("${nucleusBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
-          spgwc_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/spgw/tags/' | jq '.results[] | select(.name | test("${spgwBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
-          bess_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-bess/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
-          zmqiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-cpiface/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
-          pfcpiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-pfcpiface/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="zdwonf") |.name' | head -1 | tr -d \\\""""
+          hssdb_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hssdb/tags/' | jq '.results[] | select(.name | test("${c3poBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="onfauto") |.name' | head -1 | tr -d \\\""""
+          hss_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hss/tags/' | jq '.results[] | select(.name | test("${c3poBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="onfauto") |.name' | head -1 | tr -d \\\""""
+          mme_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/nucleus/tags/' | jq '.results[] | select(.name | test("${nucleusBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="onfauto") |.name' | head -1 | tr -d \\\""""
+          spgwc_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/spgw/tags/' | jq '.results[] | select(.name | test("${spgwBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="onfauto") |.name' | head -1 | tr -d \\\""""
+          bess_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-bess/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="onfauto") |.name' | head -1 | tr -d \\\""""
+          zmqiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-cpiface/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="onfauto") |.name' | head -1 | tr -d \\\""""
+          pfcpiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-pfcpiface/tags/' | jq '.results[] | select(.name | test("${upfBranchName}-[0-9a-z]{7}\$")) | select(.last_updater_username=="onfauto") |.name' | head -1 | tr -d \\\""""
 
           hssdb_image = "${params.registryProxy}/c3po-hssdb:"+hssdb_tag
           hss_image = "${params.registryProxy}/c3po-hss:"+hss_tag
@@ -109,15 +109,6 @@
       }
     }
 
-    stage ("Update aether-pod-configs"){
-      steps {
-        build job: "aether-member-only-jobs/aether-postmerge", parameters: [
-              string(name: 'repoName', value: "${repoName}"),
-              string(name: 'images', value: "${updatedImages}"),
-            ]
-      }
-    }
-
     stage ("Deploy and Test"){
       options {
         lock(resource: 'aether-dev-cluster')
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 5ece060..0409988 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -33,7 +33,7 @@
     NAME="test"
     VOLTCONFIG="$HOME/.volt/config-$NAME"
     KUBECONFIG="$HOME/.kube/kind-config-voltha-$NAME"
-    EXTRA_HELM_FLAGS=" --set defaults.image_registry=mirror.registry.opennetworking.org/ "
+    EXTRA_HELM_FLAGS=" --set global.image_registry=mirror.registry.opennetworking.org/ "
   }
 
   stages {
@@ -215,7 +215,7 @@
            fi
 
            if [[ "${gerritProject}" == voltha-helm-charts ]]; then
-             export EXTRA_HELM_FLAGS+="--set defaults.image_tag=null "
+             export EXTRA_HELM_FLAGS+="--set global.image_tag=null "
            fi
 
            # Workflow-specific flags
@@ -343,7 +343,7 @@
            export BBSIM_CFG="configs/bbsim-sadis-dt.yaml"
 
            if [[ "${gerritProject}" == voltha-helm-charts ]]; then
-             export EXTRA_HELM_FLAGS+="--set defaults.image_tag=null "
+             export EXTRA_HELM_FLAGS+="--set global.image_tag=null "
            fi
 
            # start logging
@@ -405,7 +405,7 @@
            export BBSIM_CFG="configs/bbsim-sadis-tt.yaml"
 
            if [[ "${gerritProject}" == voltha-helm-charts ]]; then
-             export EXTRA_HELM_FLAGS+="--set defaults.image_tag=null "
+             export EXTRA_HELM_FLAGS+="--set global.image_tag=null "
            fi
 
            # start logging
diff --git a/jjb/pipeline/voltha-openonu-go-tests.groovy b/jjb/pipeline/voltha-openonu-go-tests.groovy
index 2cfd073..335009d 100755
--- a/jjb/pipeline/voltha-openonu-go-tests.groovy
+++ b/jjb/pipeline/voltha-openonu-go-tests.groovy
@@ -39,7 +39,7 @@
     CONFIG_SADIS="external"
     BBSIM_CFG="configs/bbsim-sadis-att.yaml"
     ROBOT_MISC_ARGS="-d $WORKSPACE/RobotLogs"
-    EXTRA_HELM_FLAGS=" --set defaults.image_registry=mirror.registry.opennetworking.org/ "
+    EXTRA_HELM_FLAGS=" --set global.image_registry=mirror.registry.opennetworking.org/ "
   }
   stages {
     stage('Clone kind-voltha') {
diff --git a/jjb/verify/up4.yaml b/jjb/verify/up4.yaml
index 524fa39..3c3327f 100644
--- a/jjb/verify/up4.yaml
+++ b/jjb/verify/up4.yaml
@@ -1,74 +1,125 @@
 ---
 # jobs for https://github.com/omec-project/up4
 
--  project:
-      name: up4
-      project: "{name}"
-      github-organization: "omec-project"
-      github_pr_auth_id: "64fe2b1a-b33a-4f13-8442-ad8360434003"
-      github_pr_org_list:
-         - "omec-project"
-      jobs:
-         -  "up4-jobs":
-               stream: "master"
-               # As we run integration tests with 3 ONOS instances,
-               # we need a beefy node.
-               build-node: "ubuntu16.04-basebuild-8c-15g"
+- project:
+    name: up4
+    project: "{name}"
+    github-organization: "omec-project"
+    github_pr_auth_id: "64fe2b1a-b33a-4f13-8442-ad8360434003"
+    github_pr_org_list:
+      - "omec-project"
+    jobs:
+      - "up4-jobs":
+          stream: "master"
+          # As we run integration tests with 3 ONOS instances,
+          # we need a beefy node.
+          build-node: "ubuntu16.04-basebuild-8c-15g"
 
--  job-group:
-      name: "up4-jobs"
-      jobs:
-         - "up4-pr-verify"
+- job-group:
+    name: "up4-jobs"
+    jobs:
+      - "up4-pr-verify"
 
--  job-template:
-      id: "up4-pr-verify"
-      name: "up4-pr-verify"
-      description: |
-         Created by {id} job-template from ci-management/up4.yaml<br/>
+- job-template:
+    id: "up4-pr-verify"
+    name: "up4-pr-verify"
+    description: |
+      Created by {id} job-template from ci-management/up4.yaml<br/>
 
-      project-type: pipeline
-      concurrent: true
+    project-type: pipeline
+    concurrent: true
 
-      properties:
-         # Visibility restricted to Aether members only.
-         -  cord-infra-aether-private:
-         -  cord-infra-properties:
-               build-days-to-keep: "15"
-               artifact-num-to-keep: "-1"
-         -  github:
-               url: "https://github.com/{github-organization}/{project}"
+    properties:
+      # Visibility restricted to Aether members only.
+      - cord-infra-aether-private:
+      - cord-infra-properties:
+          build-days-to-keep: "15"
+          artifact-num-to-keep: "-1"
+      - github:
+          url: "https://github.com/{github-organization}/{project}"
 
-      parameters:
-         -  string:
-               name: buildNode
-               default: "{build-node}"
-               description: "Name of the Jenkins executor node to run the job on."
-         -  string:
-               name: sha1
-               default: "origin/{stream}"
-               description: "The actual commit or branch to build."
+    parameters:
+      - string:
+          name: buildNode
+          default: "{build-node}"
+          description: "Name of the Jenkins executor node to run the job on."
+      - string:
+          name: sha1
+          default: "origin/{stream}"
+          description: "SHA string of the pull request commit to build. Populated by GitHUb Pull Request Builder."
 
-      # Run pipeline that is checked-in in the same PR we want to verify.
-      pipeline-scm:
-         script-path: ".jenkins/Jenkinsfile"
-         scm:
-            -  git:
-                  url: "git@github.com:{github-organization}/{project}.git"
-                  credentials-id: "github-onf-bot-ssh-key"
-                  refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
-                  branches:
-                     - "$sha1"
-                  submodule:
-                     disable: true
-                  shallow-clone: true
+    # Run pipeline that is checked-in in the same PR we want to verify.
+    pipeline-scm:
+      script-path: ".jenkins/Jenkinsfile"
+      scm:
+        - git:
+            url: "git@github.com:{github-organization}/{project}.git"
+            credentials-id: "github-onf-bot-ssh-key"
+            refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+            branches:
+              - "$sha1"
+            submodule:
+              disable: true
+            shallow-clone: true
 
-      triggers:
-         -  cord-infra-github-pr-trigger:
-               github_pr_org_list: "{obj:github_pr_org_list}"
-               github_pr_auth_id: "{github_pr_auth_id}"
-               status_context: "up4-pr-verify"
+    triggers:
+      - cord-infra-github-pr-trigger:
+          github_pr_org_list: "{obj:github_pr_org_list}"
+          github_pr_auth_id: "{github_pr_auth_id}"
+          status_context: "up4-pr-verify"
 
-      wrappers:
-         -  lf-infra-wrappers:
-               build-timeout: "{build-timeout}"
-               jenkins-ssh-credential: "{jenkins-ssh-credential}"
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+- job-template:
+    id: "up4-postmerge"
+    name: "up4-postmerge"
+    description: |
+      Created by {id} job-template from ci-management/up4.yaml<br/>
+
+    project-type: pipeline
+    concurrent: true
+
+    properties:
+      # Visibility restricted to Aether members only.
+      - cord-infra-aether-private:
+      - cord-infra-properties:
+          build-days-to-keep: "15"
+          artifact-num-to-keep: "-1"
+      - github:
+          url: "https://github.com/{github-organization}/{project}"
+
+    parameters:
+      - string:
+          name: buildNode
+          default: "{build-node}"
+          description: "Name of the Jenkins executor node to run the job on."
+      - string:
+          name: commitHash
+          default: 'origin/{stream}'
+          description: 'SHA string of the merged commit to build. Populated by Generic Webhook Trigger.'
+
+    pipeline-scm:
+      script-path: ".jenkins/Jenkinsfile"
+      scm:
+        - git:
+            url: "git@github.com:{github-organization}/{project}.git"
+            credentials-id: "github-onf-bot-ssh-key"
+            refspec: "+refs/heads/*:refs/remotes/origin/*"
+            branches:
+              - "$commitHash"
+            submodule:
+              disable: true
+            shallow-clone: true
+
+    triggers:
+      - cord-infra-github-pr-trigger-merge:
+          project: '{project}'
+      - timed: "@midnight"
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 817e15f..67c5aeb 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -157,6 +157,7 @@
           oltDebVersionMaster: 'openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb'
           oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
           profile: 'Default'
+          default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
 
       # Per-patchset Pod builds on Tucson pod
       - 'verify_physical_voltha_patchset_manual':
@@ -167,7 +168,7 @@
           oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
           profile: 'Default'
           trigger-string: 'hardware test'
-          default-test-args: '-i sanityORDeleteOLT -X'
+          default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
 
 
       # Per-patchset Pod builds on Tucson pod
@@ -180,8 +181,7 @@
           profile: 'Default'
           pipeline-script: 'voltha-dt-physical-build-and-tests.groovy'
           trigger-string: 'DT hardware test'
-          default-test-args: '-i sanityDt -X'
-
+          default-test-args: '-i sanityDt -i PowerSwitch -X'
 
 
       # Manual build job for Tucson pod
@@ -194,6 +194,7 @@
           oltDebVersionMaster: 'openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb'
           oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
           profile: 'Default'
+          default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
 
 - job-template:
     id: 'voltha-periodic-test'