diff --git a/deployment-configs/aether/apps/gcp-prd/nem-monitoring.yaml b/deployment-configs/aether/apps/gcp-prd/nem-monitoring.yaml
new file mode 100644
index 0000000..7291171
--- /dev/null
+++ b/deployment-configs/aether/apps/gcp-prd/nem-monitoring.yaml
@@ -0,0 +1,34 @@
+kpi_exporter:
+  enabled: false
+
+prometheus:
+  alertmanager:
+    enabled: false
+  kubeStateMetrics:
+    enabled: true
+    fullnameOverride: "nem-monitoring-prometheus-kube-state-metrics"
+  nodeExporter:
+    enabled: true
+    fullnameOverride: "nem-monitoring-prometheus-node-exporter"
+  pushgateway:
+    enabled: false
+  server:
+    enabled: true
+    fullnameOverride: "nem-monitoring-prometheus-server"
+    # NOTE: set unique datacenter name for each clusters
+    global:
+      external_labels:
+        datacenter: "central-gcp"
+
+grafana:
+  fullnameOverride: "nem-monitoring-grafana"
+
+dashboards:
+  k8s: false
+  nodeExporter: false
+  xos: false
+  onos: false
+  aaa: false
+  voltha: false
+  omec: false
+  aether: true
diff --git a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
index d91181b..e92cb61 100644
--- a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
@@ -13,6 +13,14 @@
   server:
     enabled: true
     fullnameOverride: "nem-monitoring-prometheus-server"
+    extraArgs:
+      web.route-prefix: "/prometheus"
+      web.external-url: "https://aether.onlab.us/prometheus"
+    prefixURL: "/prometheus"
+    ingress:
+      enabled: true
+      hosts:
+        - aether.onlab.us/prometheus
   serverFiles:
     prometheus.yml:
       scrape_configs:
@@ -26,12 +34,12 @@
               - '{job="kubernetes-service-endpoints"}'
           static_configs:
             - targets:
-              - nem-monitoring-prometheus-server.nem-monitoring-p-s5pp8.svc.product.central:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-dw2cc.svc.azure.central:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-jpq59.svc.mwc.edge:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-ccrkh.svc.intel.edge:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-dn5h5.svc.tucson.edge:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-bcrtc.svc.ntt.edge:80
+              - nem-monitoring-prometheus-server.nem-monitoring-p-74nmx.svc.product.central:80
+              - nem-monitoring-prometheus-server.nem-monitoring-p-whlwm.svc.azure.central:80
+              - nem-monitoring-prometheus-server.nem-monitoring-p-9ljjp.svc.menlo.edge:80
+              - nem-monitoring-prometheus-server.nem-monitoring-p-7jkzz.svc.intel.edge:80
+              - nem-monitoring-prometheus-server.nem-monitoring-p-h27t2.svc.tucson.edge:80
+              - nem-monitoring-prometheus-server.nem-monitoring-p-5lgn2.svc.ntt.edge:80
         - job_name: 'mme-exporter-production'
           metrics_path: /metrics
           scrape_interval: 15s
@@ -48,6 +56,36 @@
 
 grafana:
   fullnameOverride: "nem-monitoring-grafana"
+  ingress:
+    enabled: true
+    hosts:
+      - aether.onlab.us
+    path: "/grafana"
+  grafana.ini:
+    server:
+      domain: aether.onlab.us
+      root_url: https://aether.onlab.us/grafana
+      serve_from_sub_path: true
+    paths:
+      data: /var/lib/grafana/data
+      logs: /var/log/grafana
+      plugins: /var/lib/grafana/plugins
+      provisioning: /etc/grafana/provisioning
+    analytics:
+      check_for_updates: true
+    log:
+      mode: console
+    grafana_net:
+      url: https://grafana.net
+  datasources:
+    datasources.yaml:
+      apiVersion: 1
+      datasources:
+        - name: Prometheus
+          type: prometheus
+          url: http://nem-monitoring-prometheus-server/prometheus
+          access: proxy
+          isDefault: true
 
 dashboards:
   k8s: false
diff --git a/deployment-configs/aether/apps/intel/omec-upf.yaml b/deployment-configs/aether/apps/intel/omec-upf.yaml
index c1d444b..448f0b4 100644
--- a/deployment-configs/aether/apps/intel/omec-upf.yaml
+++ b/deployment-configs/aether/apps/intel/omec-upf.yaml
@@ -1,7 +1,7 @@
 images:
   tags:
-    bess: "registry.central.aetherproject.net/upf-epc-bess:0.1.0-intel"
-    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:0.1.0-intel"
+    bess: "registry.central.aetherproject.net/upf-epc-bess:intel-native"
+    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:intel-native"
   pullPolicy: "IfNotPresent"
 
 nodeSelectors:
diff --git a/deployment-configs/aether/clusters/production-azure-central.yml b/deployment-configs/aether/clusters/production-central-azure.yml
similarity index 93%
rename from deployment-configs/aether/clusters/production-azure-central.yml
rename to deployment-configs/aether/clusters/production-central-azure.yml
index 2f1e45f..1573430 100644
--- a/deployment-configs/aether/clusters/production-azure-central.yml
+++ b/deployment-configs/aether/clusters/production-central-azure.yml
@@ -1,4 +1,4 @@
-name: production-azure-central
+name: production-central-azure
 rancher_kubernetes_engine_config:
   authentication:
     strategy: x509
@@ -76,11 +76,6 @@
             reload
             loadbalance
         }
-        mwc.edge:53 {
-            errors
-            cache 30
-            forward . 10.54.128.10
-        }
 
 windows_prefered_cluster: false
 docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-gcp-central.yml b/deployment-configs/aether/clusters/production-central-gcp.yml
similarity index 90%
rename from deployment-configs/aether/clusters/production-gcp-central.yml
rename to deployment-configs/aether/clusters/production-central-gcp.yml
index 5360c1c..ac9b33e 100644
--- a/deployment-configs/aether/clusters/production-gcp-central.yml
+++ b/deployment-configs/aether/clusters/production-central-gcp.yml
@@ -1,4 +1,4 @@
-name: production-central
+name: production-central-gcp
 rancher_kubernetes_engine_config:
   authentication:
     strategy: x509
@@ -96,16 +96,6 @@
             reload
             loadbalance
         }
-        menlo.edge:53 {
-            errors
-            cache 30
-            forward . 10.53.128.10
-        }
-        mwc.edge:53 {
-            errors
-            cache 30
-            forward . 10.54.128.10
-        }
 
 windows_prefered_cluster: false
 docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/production-global.yml b/deployment-configs/aether/clusters/production-global.yml
index 5b1a6bc..82c9d92 100644
--- a/deployment-configs/aether/clusters/production-global.yml
+++ b/deployment-configs/aether/clusters/production-global.yml
@@ -93,30 +93,30 @@
             cache 30
             forward . 10.52.128.10
         }
-        staging.central:53 {
+        azure.central:53 {
             errors
             cache 30
-            forward . 10.47.128.10
+            forward . 10.55.128.10
         }
         menlo.edge:53 {
             errors
             cache 30
             forward . 10.53.128.10
         }
-        a.staging.edge:53 {
+        tucson.edge:53 {
             errors
             cache 30
-            forward . 10.48.128.10
+            forward . 10.59.128.10
         }
-        b.staging.edge:53 {
+        intel.edge:53 {
             errors
             cache 30
-            forward . 10.49.128.10
+            forward . 10.212.74.138
         }
-        c.staging.edge:53 {
+        ntt.edge:53 {
             errors
             cache 30
-            forward . 10.50.128.10
+            forward . 10.80.128.10
         }
 
 windows_prefered_cluster: false
diff --git a/deployment-configs/aether/clusters/staging-central.yml b/deployment-configs/aether/clusters/staging-central.yml
index 30ca92e..f203eeb 100644
--- a/deployment-configs/aether/clusters/staging-central.yml
+++ b/deployment-configs/aether/clusters/staging-central.yml
@@ -1,4 +1,4 @@
-name: staging-central
+name: staging-central-gcp
 rancher_kubernetes_engine_config:
   authentication:
     strategy: x509
@@ -96,21 +96,6 @@
             reload
             loadbalance
         }
-        a.staging.edge:53 {
-            errors
-            cache 30
-            forward . 10.48.128.10
-        }
-        b.staging.edge:53 {
-            errors
-            cache 30
-            forward . 10.49.128.10
-        }
-        c.staging.edge:53 {
-            errors
-            cache 30
-            forward . 10.50.128.10
-        }
 
 windows_prefered_cluster: false
 docker_root_dir: /var/lib/docker
diff --git a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
index b4d8774..a5f95ef 100644
--- a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
+++ b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
@@ -79,10 +79,10 @@
             reload
             loadbalance
         }
-        product.central:53 {
+        staging.central:53 {
             errors
             cache 30
-            forward . 10.52.128.10
+            forward . 10.47.128.10
         }
         aetherproject.net {
             hosts {
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index ab28cad..11d13d1 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -64,6 +64,17 @@
       ip: '10.128.100.71'
       user: 'cord'
       pass: 'cord'
+      dp_iface_name: 'ens6f1.11'
+      container_type: null
+      container_name: null
+      onu: 'BRCM22222222'
+      c_tag: '11'
+      s_tag: '11'
+      power_switch_port: 6
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
       dp_iface_name: 'ens6f0.22'
       container_type: null
       container_name: null
@@ -71,6 +82,7 @@
       olt: 'EC1904000654'
       c_tag: '22'
       s_tag: '22'
+      power_switch_port: 1
     -
       ip: '10.128.100.71'
       user: 'cord'
@@ -82,12 +94,23 @@
       olt: 'EC1904000654'
       c_tag: '33'
       s_tag: '33'
+      power_switch_port: 5
   dst:
     -
       ip: null
       user: null
       pass: null
       dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.11.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
       dp_iface_ip_qinq: '10.22.22.254'
       dp_iface_ip: null
       dp_iface_gateway: null
@@ -103,3 +126,9 @@
       dp_iface_gateway: null
       container_type: null
       container_name: null
+
+web_power_switch:
+  ip: '10.128.100.75'
+  user: 'cord'
+  password: 'cord'
+  type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 0873c15..f9dcec0 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -64,6 +64,17 @@
       ip: '10.128.100.71'
       user: 'cord'
       pass: 'cord'
+      dp_iface_name: 'ens6f1'
+      container_type: null
+      container_name: null
+      onu: 'BRCM22222222'
+      c_tag: '11'
+      s_tag: '99'
+      power_switch_port: 6
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
       dp_iface_name: 'ens6f0'
       container_type: null
       container_name: null
@@ -71,6 +82,7 @@
       olt: 'EC1904000654'
       c_tag: '22'
       s_tag: '99'
+      power_switch_port: 1
     -
       ip: '10.128.100.71'
       user: 'cord'
@@ -82,12 +94,23 @@
       olt: 'EC1904000654'
       c_tag: '33'
       s_tag: '99'
+      power_switch_port: 5
   dst:
     -
       ip: null
       user: null
       pass: null
       dp_iface_name: null
+      dp_iface_ip_qinq: '10.99.11.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
       dp_iface_ip_qinq: '10.99.22.254'
       dp_iface_ip: null
       dp_iface_gateway: null
@@ -103,3 +126,9 @@
       dp_iface_gateway: null
       container_type: null
       container_name: null
+
+web_power_switch:
+  ip: '10.128.100.75'
+  user: 'cord'
+  password: 'cord'
+  type: 'DLI'
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index 293ef42..02c0b71 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -16,6 +16,10 @@
   image_tag: master
   image_pullPolicy: Always
 
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
 #images:
 #  onos:
 #    repository: voltha/voltha-onos
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index 293ef42..02c0b71 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -16,6 +16,10 @@
   image_tag: master
   image_pullPolicy: Always
 
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
 #images:
 #  onos:
 #    repository: voltha/voltha-onos