diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 3d8517d..cad8f41 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -66,7 +66,7 @@
     failure-email-address: 'cord-dev@opencord.org'
 
     # Projects containing helm-charts
-    helm-charts-projects-regexp: '^(.*helm-charts|cord-platform|seba)$'
+    helm-charts-projects-regexp: '^(?!aether)(.*helm-charts|cord-platform|seba)$'
 
     # regexp for gerrit triggers
     # list of supported branches, for branch-regexp
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 6c9b644..721323c 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -27,6 +27,8 @@
           pod: 'dev'
           build-node: 'ng40-host-node'
           ng40-vm: 'ng40@192.168.122.101'
+          cp-context: 'dev-central-gcp'
+          dp-context: 'dev-edge-onf-menlo'
       - 'omec-archive-artifacts':
           pod: 'dev'
           build-node: 'omec-ci'
@@ -846,6 +848,16 @@
           default: 'run.ntl'
           description: 'NG40 test automation file'
 
+      - string:
+          name: cpContext
+          default: '{cp-context}'
+          description: 'K8S context for omec control plane.'
+
+      - string:
+          name: dpContext
+          default: '{dp-context}'
+          description: 'K8S context for omec data plane.'
+
     concurrent: false
 
     pipeline-scm:
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 485fdbf..0f9e0a9 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -221,7 +221,7 @@
            echo export EXTRA_HELM_FLAGS=\\"\$EXTRA_HELM_FLAGS\\" >> minimal-env.sh
 
            mkdir -p $ROBOT_LOGS_DIR
-           export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
+           export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR -e PowerSwitch"
 
            # By default, all tests tagged 'sanity' are run.  This covers basic functionality
            # like running through the ATT workflow for a single subscriber.
@@ -260,7 +260,7 @@
            DEPLOY_K8S=n ./voltha up
 
            mkdir -p $ROBOT_LOGS_DIR
-           export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
+           export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR -e PowerSwitch"
 
            # By default, all tests tagged 'sanityDt' are run.  This covers basic functionality
            # like running through the DT workflow for a single subscriber.
diff --git a/jjb/pipeline/voltha-go-multi-tests.groovy b/jjb/pipeline/voltha-go-multi-tests.groovy
index 8d94841..9add00e 100644
--- a/jjb/pipeline/voltha-go-multi-tests.groovy
+++ b/jjb/pipeline/voltha-go-multi-tests.groovy
@@ -37,7 +37,7 @@
     DEPLOY_K8S="y"
     VOLTHA_LOG_LEVEL="DEBUG"
     CONFIG_SADIS="n"
-    ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs"
+    ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs -e PowerSwitch"
   }
   stages {
 
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index e843fa8..1f52398 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -37,7 +37,7 @@
     DEPLOY_K8S="yes"
     VOLTHA_LOG_LEVEL="DEBUG"
     CONFIG_SADIS="no"
-    ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs"
+    ROBOT_MISC_ARGS="${params.extraRobotArgs} -d $WORKSPACE/RobotLogs -e PowerSwitch"
   }
   stages {