diff --git a/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml b/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml
index 3662c68..8e8a621 100644
--- a/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml
+++ b/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml
@@ -2,5 +2,7 @@
   sriov:
     resourceList:
       vfio:
-        pfNames:
-          - eth2
+        s1uPfNames:
+          - eth2#0-3
+        sgiPfNames:
+          - eth2#4-7
diff --git a/deployment-configs/aether/apps/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global-nem-monitoring.yaml
index 2f7ca98..9bc6472 100644
--- a/deployment-configs/aether/apps/global-nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/global-nem-monitoring.yaml
@@ -28,7 +28,6 @@
             - targets:
               - cord-platform-prometheus-server.cord-platform-p-s5pp8.svc.product.central:80
               - cord-platform-prometheus-server.cord-platform-p-6lcrm.svc.menlo.edge:80
-              - cord-platform-prometheus-server.cord-platform-p-lmx6j.svc.b.staging.edge:80
   extraScrapeConfigs: ""
 
 grafana:
diff --git a/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/production-accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-common.yaml
rename to deployment-configs/aether/apps/production-accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/production-accelleran-cbrs-cu-202.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production-multicluster-accelleran-cbrs-cu.yaml
rename to deployment-configs/aether/apps/production-accelleran-cbrs-cu-202.yaml
diff --git a/deployment-configs/aether/apps/production-omec-dp-menlo.yaml b/deployment-configs/aether/apps/production-omec-dp-menlo.yaml
deleted file mode 100644
index ba72dfe..0000000
--- a/deployment-configs/aether/apps/production-omec-dp-menlo.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
-  pullPolicy: "Always"
-
-config:
-  spgwu:
-    multiUpfs: true
-    cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
-    s1u:
-      device: "s1u-net"
-      # NOTE: set different IP for each edge
-      ip: "119.0.0.7/24"
-    sgi:
-      device: "sgi-net"
-      # NOTE: set different IP for each edge
-      ip: "13.1.1.7/24"
-    dpName: "dp1"
-networks:
-  sgi:
-    # NOTE: set correct gateway for each edge
-    gateway: "13.1.1.250" # Vyatta router IP
diff --git a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
similarity index 91%
rename from deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
rename to deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
index ba72dfe..5e90e65 100644
--- a/deployment-configs/aether/apps/production-multicluster-omec-dp.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-onf-menlo.yaml
@@ -20,4 +20,4 @@
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
-    gateway: "13.1.1.250" # Vyatta router IP
+    gateway: "13.1.1.30"
diff --git a/deployment-configs/aether/apps/production-omec-dp-staging-b.yaml b/deployment-configs/aether/apps/production-omec-dp-staging-b.yaml
deleted file mode 100644
index f0d06aa..0000000
--- a/deployment-configs/aether/apps/production-omec-dp-staging-b.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
-  pullPolicy: "Always"
-
-config:
-  spgwu:
-    multiUpfs: true
-    cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
-    s1u:
-      device: "s1u-net"
-      # NOTE: set different IP for each edge
-      ip: "119.0.0.8/24"
-    sgi:
-      device: "sgi-net"
-      # NOTE: set different IP for each edge
-      ip: "13.1.1.8/24"
-    dpName: "dp2"
-networks:
-  sgi:
-    # NOTE: set correct gateway for each edge
-    gateway: "13.1.1.250" # Vyatta router IP
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-a.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-a.yaml
new file mode 100644
index 0000000..b91deae
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-a.yaml
@@ -0,0 +1,3 @@
+config:
+  nats:
+    ip: "119.0.0.20"
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-b.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-b.yaml
new file mode 100644
index 0000000..6e0f6ab
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-b.yaml
@@ -0,0 +1,3 @@
+config:
+  nats:
+    ip: "119.0.0.21"
diff --git a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-c.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-c.yaml
new file mode 100644
index 0000000..dd7b786
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-c.yaml
@@ -0,0 +1,3 @@
+config:
+  nats:
+    ip: "119.0.0.22"
diff --git a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-nokia.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-common.yaml
rename to deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-nokia.yaml
diff --git a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml
similarity index 62%
rename from deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml
rename to deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml
index b092538..749442b 100644
--- a/deployment-configs/aether/apps/staging-multicluster-accelleran-cbrs-cu.yaml
+++ b/deployment-configs/aether/apps/staging-accelleran-cbrs-cu-203.yaml
@@ -3,5 +3,5 @@
     ip: "10.168.0.192"
   vranL3:
     plmnId: "130501"
-    instanceId: "onfcell222"
-    tac: 222
\ No newline at end of file
+    instanceId: "onfcell203"
+    tac: 203
diff --git a/deployment-configs/aether/apps/staging-omec-cp.yaml b/deployment-configs/aether/apps/staging-omec-cp.yaml
index ce40672..6386972 100644
--- a/deployment-configs/aether/apps/staging-omec-cp.yaml
+++ b/deployment-configs/aether/apps/staging-omec-cp.yaml
@@ -17,7 +17,8 @@
   spgwc:
     apn: internet
     multiUpfs: true
-    s1uAddr: "119.0.0.43"
+    # can be any IP address, not used but crash without it
+    s1uAddr: "119.0.0.3"
   mme:
     cfgFiles:
       config.json:
diff --git a/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml
new file mode 100644
index 0000000..dfab493
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml
@@ -0,0 +1,20 @@
+images:
+  tags:
+    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+  pullPolicy: "Always"
+
+config:
+  spgwu:
+    multiUpfs: true
+    cpComm:
+      addr: "spgwc-headless.omec.svc.staging.central"
+    s1u:
+      device: "s1u-net"
+      ip: "119.0.0.3/24"
+    sgi:
+      device: "sgi-net"
+      ip: "13.1.1.3/24"
+    dpName: "dp-staging-a"
+networks:
+  sgi:
+    gateway: "13.1.1.20"
diff --git a/deployment-configs/aether/apps/staging-omec-dp-staging-b.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-b.yaml
new file mode 100644
index 0000000..93de0db
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-b.yaml
@@ -0,0 +1,20 @@
+images:
+  tags:
+    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+  pullPolicy: "Always"
+
+config:
+  spgwu:
+    multiUpfs: true
+    cpComm:
+      addr: "spgwc-headless.omec.svc.staging.central"
+    s1u:
+      device: "s1u-net"
+      ip: "119.0.0.4/24"
+    sgi:
+      device: "sgi-net"
+      ip: "13.1.1.4/24"
+    dpName: "dp-staging-b"
+networks:
+  sgi:
+    gateway: "13.1.1.21"
diff --git a/deployment-configs/aether/apps/staging-omec-dp-staging-c.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-c.yaml
new file mode 100644
index 0000000..290b91e
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-c.yaml
@@ -0,0 +1,20 @@
+images:
+  tags:
+    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+  pullPolicy: "Always"
+
+config:
+  spgwu:
+    multiUpfs: true
+    cpComm:
+      addr: "spgwc-headless.omec.svc.staging.central"
+    s1u:
+      device: "s1u-net"
+      ip: "119.0.0.5/24"
+    sgi:
+      device: "sgi-net"
+      ip: "13.1.1.5/24"
+    dpName: "dp-staging-c"
+networks:
+  sgi:
+    gateway: "13.1.1.22"
diff --git a/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
index 02b2785..14a96af 100644
--- a/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
+++ b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
@@ -17,4 +17,4 @@
     dpName: "dp-nokia"
 networks:
   sgi:
-    gateway: "13.1.1.43" # Vyatta router IP
+    gateway: "13.1.1.42"