diff --git a/deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml b/deployment-configs/aether/apps/production-omec-dp-cni.yaml
similarity index 100%
rename from deployment-configs/aether/apps/common-multicluster-omec-dp-cni.yaml
rename to deployment-configs/aether/apps/production-omec-dp-cni.yaml
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
deleted file mode 100644
index b91deae..0000000
--- a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-a.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 6e0f6ab..0000000
--- a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-b.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index dd7b786..0000000
--- a/deployment-configs/aether/apps/staging-accelleran-cbrs-common-staging-c.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-config:
-  nats:
-    ip: "119.0.0.22"
diff --git a/deployment-configs/aether/apps/staging-omec-dp-cni.yaml b/deployment-configs/aether/apps/staging-omec-dp-cni.yaml
new file mode 100644
index 0000000..f2b525d
--- /dev/null
+++ b/deployment-configs/aether/apps/staging-omec-dp-cni.yaml
@@ -0,0 +1,8 @@
+config:
+  sriov:
+    resourceList:
+      vfio:
+        s1uPfNames:
+          - ens1f0#0-3
+        sgiPfNames:
+          - ens1f0#4-7
diff --git a/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml
deleted file mode 100644
index dfab493..0000000
--- a/deployment-configs/aether/apps/staging-omec-dp-staging-a.yaml
+++ /dev/null
@@ -1,20 +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.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
deleted file mode 100644
index 93de0db..0000000
--- a/deployment-configs/aether/apps/staging-omec-dp-staging-b.yaml
+++ /dev/null
@@ -1,20 +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.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
deleted file mode 100644
index 290b91e..0000000
--- a/deployment-configs/aether/apps/staging-omec-dp-staging-c.yaml
+++ /dev/null
@@ -1,20 +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.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"