diff --git a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
index 2922cc1..6cd0952 100644
--- a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
@@ -27,10 +27,9 @@
           static_configs:
             - targets:
               - nem-monitoring-prometheus-server.nem-monitoring-p-s5pp8.svc.product.central:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-6lcrm.svc.menlo.edge:80
               - nem-monitoring-prometheus-server.nem-monitoring-p-dw2cc.svc.azure.central:80
               - nem-monitoring-prometheus-server.nem-monitoring-p-vqzqg.svc.mwc.edge:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-hbr5z.svc.intel.edge:80
+              - nem-monitoring-prometheus-server.nem-monitoring-p-ccrkh.svc.intel.edge:80
         - job_name: 'mme-exporter-production'
           metrics_path: /metrics
           scrape_interval: 15s
diff --git a/deployment-configs/aether/apps/intel/omec-dp.yaml b/deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
similarity index 91%
rename from deployment-configs/aether/apps/intel/omec-dp.yaml
rename to deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
index 0b6cae8..0ee2f97 100644
--- a/deployment-configs/aether/apps/intel/omec-dp.yaml
+++ b/deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
@@ -17,7 +17,7 @@
     s1u:
       device: "s1u-net"
       # NOTE: set different IP for each edge
-      ip: "10.212.74.67/27"
+      ip: "10.212.74.67/28"
     sgi:
       device: "sgi-net"
       # NOTE: set different IP for each edge
@@ -26,4 +26,5 @@
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
+    mask: "255.255.255.224"
     gateway: "10.212.74.126"
diff --git a/deployment-configs/aether/apps/intel/omec-upf.yaml b/deployment-configs/aether/apps/intel/omec-upf.yaml
new file mode 100644
index 0000000..c1d444b
--- /dev/null
+++ b/deployment-configs/aether/apps/intel/omec-upf.yaml
@@ -0,0 +1,36 @@
+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"
+  pullPolicy: "IfNotPresent"
+
+nodeSelectors:
+  enabled: true
+  spgwu:
+    label: omec-upf
+    value: enabled
+
+config:
+  spgwu:
+    name: "dp-intel"
+    s1u:
+      device: "s1u"
+      ip: "10.212.74.81/28"
+    sgi:
+      device: "sgi"
+      ip: "10.212.74.97/27"
+    zmq:
+      spgwc:
+        addr: "spgwc-headless.omec.svc.product.central"
+
+networks:
+  enb:
+    subnet: "10.212.74.64/28"
+  ue:
+    subnet: "10.250.0.0/16"
+  sgi:
+    subnet: "10.212.74.96/27"
+    gateway: "10.212.74.126"
+  s1u:
+    subnet: "10.212.74.80/28"
+    gateway: "10.212.74.94"
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
new file mode 100644
index 0000000..bde71a2
--- /dev/null
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -0,0 +1,122 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for BBWF POD
+
+---
+
+kube_config: '/var/k8.conf'
+
+nodes:
+  -
+    ip: '10.128.100.70'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.71'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.72'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:61:80:ca'
+    ip: '10.128.100.80'
+    user: 'root'
+    pass: 'onl'
+    bngPort: '31'
+    oltPort: '1'
+    device_id: 'of:0000000000000001'
+
+olts:
+  -
+    name: 'edgecore'
+    ip: '10.128.100.90'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    serial: 'EC1904000654'
+
+onus:
+  -
+    serial: 'BRCM22222222'
+  -
+    serial: 'ALPHe3d1cf9d'
+
+hosts:
+  src:
+    -
+      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'
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens6f0.22'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cf9d'
+      c_tag: '22'
+      s_tag: '22'
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens6f2.33'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1ced5'
+      c_tag: '33'
+      s_tag: '33'
+  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
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.33.33.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null