diff --git a/deployment-configs/aether/apps/menlo-demo/omec-upf.yaml b/deployment-configs/aether/apps/menlo-demo/omec-upf.yaml
new file mode 100644
index 0000000..38a21c4
--- /dev/null
+++ b/deployment-configs/aether/apps/menlo-demo/omec-upf.yaml
@@ -0,0 +1,30 @@
+images:
+  tags:
+    bess: "registry.central.aetherproject.net/upf-epc-bess:0.1.0-dev"
+    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:0.1.0-dev"
+  pullPolicy: "IfNotPresent"
+nodeSelectors:
+  enabled: true
+config:
+  spgwu:
+    name: "dp-demo"
+    s1u:
+      device: "s1u"
+      ip: "192.168.252.3/24"
+    sgi:
+      device: "sgi"
+      ip: "192.168.250.3/24"
+    zmq:
+      spgwc:
+        addr: "spgwc-headless.omec.svc.product.central"
+networks:
+  enb:
+    subnet: "192.168.251.0/24"
+  ue:
+    subnet: "10.250.0.0/16"
+  sgi:
+    subnet: "192.168.250.0/24"
+    gateway: "192.168.250.254"
+  s1u:
+    subnet: "192.168.252.0/24"
+    gateway: "192.168.252.254"
diff --git a/deployment-configs/aether/apps/menlo-stg/omec-upf.yaml b/deployment-configs/aether/apps/menlo-stg/omec-upf.yaml
new file mode 100644
index 0000000..19ec3a7
--- /dev/null
+++ b/deployment-configs/aether/apps/menlo-stg/omec-upf.yaml
@@ -0,0 +1,30 @@
+images:
+  tags:
+    bess: "registry.central.aetherproject.net/upf-epc-bess:0.1.0-dev"
+    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:0.1.0-dev"
+  pullPolicy: "IfNotPresent"
+nodeSelectors:
+  enabled: true
+config:
+  spgwu:
+    name: "dp-staging"
+    s1u:
+      device: "s1u"
+      ip: "192.168.252.7/24"
+    sgi:
+      device: "sgi"
+      ip: "192.168.250.7/24"
+    zmq:
+      spgwc:
+        addr: "spgwc-headless.omec.svc.product.central"
+networks:
+  enb:
+    subnet: "192.168.251.0/24"
+  ue:
+    subnet: "10.250.0.0/16"
+  sgi:
+    subnet: "192.168.250.0/24"
+    gateway: "192.168.250.1"
+  s1u:
+    subnet: "192.168.252.0/24"
+    gateway: "192.168.252.1"
diff --git a/deployment-configs/aether/apps/tucson/omec-dp.yaml b/deployment-configs/aether/apps/tucson/omec-dp.yaml
index b86fc49..67ac77f 100644
--- a/deployment-configs/aether/apps/tucson/omec-dp.yaml
+++ b/deployment-configs/aether/apps/tucson/omec-dp.yaml
@@ -1,6 +1,6 @@
 images:
   tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.0"
+    spgwu: "registry.central.aetherproject.net/ngic-dp:tucson-native-debug"
   pullPolicy: "IfNotPresent"
 
 nodeSelectors: