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"
diff --git a/deployment-configs/aether/clusters/staging-edge-c.yml b/deployment-configs/aether/clusters/production-edge-mwc.yaml
similarity index 84%
rename from deployment-configs/aether/clusters/staging-edge-c.yml
rename to deployment-configs/aether/clusters/production-edge-mwc.yaml
index c72c129..5d5f017 100644
--- a/deployment-configs/aether/clusters/staging-edge-c.yml
+++ b/deployment-configs/aether/clusters/production-edge-mwc.yaml
@@ -1,4 +1,4 @@
-name: staging-edge-c
+name: production-edge-mwc
 rancher_kubernetes_engine_config:
   authentication:
     strategy: x509
@@ -29,18 +29,18 @@
       always_pull_images: false
       pod_security_policy: false
       service_node_port_range: 2000-36767
-      service_cluster_ip_range: 10.50.128.0/17
+      service_cluster_ip_range: 10.54.128.0/17
       extra_args:
         feature-gates: "SCTPSupport=True"
     kubelet:
-      cluster_domain: c.staging.edge
-      cluster_dns_server: 10.50.128.10
+      cluster_domain: mwc.edge
+      cluster_dns_server: 10.54.128.10
       fail_swap_on: false
       extra_args:
         feature-gates: "SCTPSupport=True"
     kube-controller:
-      cluster_cidr: 10.50.0.0/17
-      service_cluster_ip_range: 10.50.128.0/17
+      cluster_cidr: 10.54.0.0/17
+      service_cluster_ip_range: 10.54.128.0/17
       extra_args:
         feature-gates: "SCTPSupport=True"
     scheduler:
@@ -63,7 +63,7 @@
         .:53 {
             errors
             health
-            kubernetes c.staging.edge in-addr.arpa ip6.arpa {
+            kubernetes mwc.edge in-addr.arpa ip6.arpa {
               pods insecure
               upstream
               fallthrough in-addr.arpa ip6.arpa
@@ -76,10 +76,10 @@
             reload
             loadbalance
         }
-        staging.central:53 {
+        product.central:53 {
             errors
             cache 30
-            forward . 10.47.128.10
+            forward . 10.52.128.10
         }
   addons_include:
     - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
diff --git a/deployment-configs/aether/clusters/staging-edge-b.yml b/deployment-configs/aether/clusters/staging-edge-b.yml
deleted file mode 100644
index 0bea65b..0000000
--- a/deployment-configs/aether/clusters/staging-edge-b.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-name: staging-edge-b
-rancher_kubernetes_engine_config:
-  authentication:
-    strategy: x509
-  ignore_docker_version: true
-  ingress:
-    provider: nginx
-  kubernetes_version: v1.15.6-rancher1-2
-  monitoring:
-    provider: none
-  network:
-    plugin: calico
-  services:
-    etcd:
-      backup_config:
-        enabled: true
-        interval_hours: 12
-        retention: 6
-        safe_timestamp: false
-      creation: 12h
-      extra_args:
-        election-timeout: 5000
-        heartbeat-interval: 500
-      gid: 0
-      retention: 72h
-      snapshot: false
-      uid: 0
-    kube_api:
-      always_pull_images: false
-      pod_security_policy: false
-      service_node_port_range: 2000-36767
-      service_cluster_ip_range: 10.49.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: b.staging.edge
-      cluster_dns_server: 10.49.128.10
-      fail_swap_on: false
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.49.0.0/17
-      service_cluster_ip_range: 10.49.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    scheduler:
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubeproxy:
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-  ssh_agent_auth: false
-  addon_job_timeout: 30
-  addons: |-
-    ---
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      namespace: kube-system
-      name: coredns
-    data:
-      Corefile: |
-        .:53 {
-            errors
-            health
-            kubernetes b.staging.edge in-addr.arpa ip6.arpa {
-              pods insecure
-              upstream
-              fallthrough in-addr.arpa ip6.arpa
-              ttl 30
-            }
-            prometheus :9153
-            forward . "/etc/resolv.conf"
-            cache 30
-            loop
-            reload
-            loadbalance
-        }
-        staging.central:53 {
-            errors
-            cache 30
-            forward . 10.47.128.10
-        }
-  addons_include:
-    - https://raw.githubusercontent.com/intel/multus-cni/master/images/multus-daemonset-pre-1.16.yml
-
-windows_prefered_cluster: false
-docker_root_dir: /var/lib/docker
-local_cluster_auth_endpoint:
-  enabled: true
-enable_network_policy: false
-enable_cluster_alerting: false
-enable_cluster_monitoring: false
diff --git a/deployment-configs/aether/clusters/staging-edge-a.yml b/deployment-configs/aether/clusters/staging-edge-nokia.yml
similarity index 87%
rename from deployment-configs/aether/clusters/staging-edge-a.yml
rename to deployment-configs/aether/clusters/staging-edge-nokia.yml
index 9313549..b750647 100644
--- a/deployment-configs/aether/clusters/staging-edge-a.yml
+++ b/deployment-configs/aether/clusters/staging-edge-nokia.yml
@@ -1,4 +1,4 @@
-name: staging-edge-a
+name: staging-edge-nokia
 rancher_kubernetes_engine_config:
   authentication:
     strategy: x509
@@ -29,18 +29,18 @@
       always_pull_images: false
       pod_security_policy: false
       service_node_port_range: 2000-36767
-      service_cluster_ip_range: 10.48.128.0/17
+      service_cluster_ip_range: 10.51.128.0/17
       extra_args:
         feature-gates: "SCTPSupport=True"
     kubelet:
-      cluster_domain: a.staging.edge
-      cluster_dns_server: 10.48.128.10
+      cluster_domain: nokia.staging.edge
+      cluster_dns_server: 10.51.128.10
       fail_swap_on: false
       extra_args:
         feature-gates: "SCTPSupport=True"
     kube-controller:
-      cluster_cidr: 10.48.0.0/17
-      service_cluster_ip_range: 10.48.128.0/17
+      cluster_cidr: 10.51.0.0/17
+      service_cluster_ip_range: 10.51.128.0/17
       extra_args:
         feature-gates: "SCTPSupport=True"
     scheduler:
@@ -63,7 +63,7 @@
         .:53 {
             errors
             health
-            kubernetes a.staging.edge in-addr.arpa ip6.arpa {
+            kubernetes nokia.staging.edge in-addr.arpa ip6.arpa {
               pods insecure
               upstream
               fallthrough in-addr.arpa ip6.arpa