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: