diff --git a/deployment-configs/aether/apps/production-omec-cp-azure.yaml b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
index a536fe8..29440ff 100644
--- a/deployment-configs/aether/apps/production-omec-cp-azure.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-azure.yaml
@@ -50,8 +50,8 @@
             dig2: 1
             dig3: 5
           mnc:
-            dig1: 1
-            dig2: 0
+            dig1: 0
+            dig2: 1
             dig3: 0
   hss:
     acl:
diff --git a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
index c5173a5..aa20397 100644
--- a/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
+++ b/deployment-configs/aether/apps/production-omec-cp-gcp.yaml
@@ -60,8 +60,8 @@
             dig2: 1
             dig3: 5
           mnc:
-            dig1: 1
-            dig2: 0
+            dig1: 0 
+            dig2: 1
             dig3: 0
   hss:
     acl:
diff --git a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
index d2cb5bb..8c66b30 100644
--- a/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
+++ b/deployment-configs/aether/apps/production-omec-dp-mwc-cbrs.yaml
@@ -13,7 +13,7 @@
   spgwu:
     multiUpfs: true
     cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
+      addr: "spgwc-headless.omec.svc.production.central"
     s1u:
       device: "s1u-net"
       # NOTE: set different IP for each edge
diff --git a/deployment-configs/aether/apps/staging-accelleran-cu-cbrs-common.yaml b/deployment-configs/aether/apps/staging-accelleran-cu-cbrs-common.yaml
deleted file mode 100644
index ba09fe9..0000000
--- a/deployment-configs/aether/apps/staging-accelleran-cu-cbrs-common.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-config:
-  nats:
-    ip: "192.168.251.42"
diff --git a/deployment-configs/aether/apps/staging-accelleran-cu-cbrs.yaml b/deployment-configs/aether/apps/staging-accelleran-cu-cbrs.yaml
deleted file mode 100644
index 749442b..0000000
--- a/deployment-configs/aether/apps/staging-accelleran-cu-cbrs.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-config:
-  mme:
-    ip: "10.168.0.192"
-  vranL3:
-    plmnId: "130501"
-    instanceId: "onfcell203"
-    tac: 203
diff --git a/deployment-configs/aether/apps/staging-cassandra.yaml b/deployment-configs/aether/apps/staging-cassandra.yaml
deleted file mode 100644
index 00fbdde..0000000
--- a/deployment-configs/aether/apps/staging-cassandra.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-fullnameOverride: "cassandra"
-image:
-  tag: "2.1.20"
-persistence:
-  enabled: true
-  storageClass: "zonal-ssd"
-config:
-  cluster_domain: "staging.central"
-  endpoint_snitch: "GossipingPropertyFileSnitch"
diff --git a/deployment-configs/aether/apps/staging-mcord-profile.yaml b/deployment-configs/aether/apps/staging-mcord-profile.yaml
deleted file mode 100644
index ffc5231..0000000
--- a/deployment-configs/aether/apps/staging-mcord-profile.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-progran:
-  enabled: false
-fabric:
-  enabled: true
-
-mcord-subscriber:
-  image:
-    repository: "omecproject/mcord-synchronizer"
-    tag: "comac-1.0.0"
-    pullPolicy: "IfNotPresent"
-
-onos-service:
-  kafkaService: "cord-platform-kafka"
-
-fabric:
-  kafkaService: "cord-platform-kafka"
-
-onosFabricRestHost: "cord-platform-onos-ui.staging-cord-platform-p-8s6wg.svc.a.staging.edge"
-onosFabricRestPort: 8181
diff --git a/deployment-configs/aether/apps/staging-omec-cp.yaml b/deployment-configs/aether/apps/staging-omec-cp.yaml
deleted file mode 100644
index e7ff870..0000000
--- a/deployment-configs/aether/apps/staging-omec-cp.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-images:
-  tags:
-    hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
-    hss: "registry.aether.opennetworking.org/c3po-hss:1.1.0"
-    mme: "registry.aether.opennetworking.org/openmme:1.1.0"
-    spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.0"
-  pullPolicy: "Always"
-
-cassandra:
-  deploy: false
-
-resources:
-  enabled: true
-
-config:
-  clusterDomain: "staging.central"
-  spgwc:
-    apn: internet
-    multiUpfs: true
-    # can be any IP address, not used but crash without it
-    s1uAddr: "192.168.251.3"
-  mme:
-    cfgFiles:
-      config.json:
-        mme:
-          mcc:
-            dig1: 3
-            dig2: 1
-            dig3: 5
-          mnc:
-            dig1: 1
-            dig2: 0
-            dig3: 0
-  hss:
-    acl:
-      oldTls: "*.staging.central"
-    bootstrap:
-      enabled: true
-      users:
-        - imsi: "315010999912345"
-          msisdn: "1122334455"
-          apn: "apn1"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912346"
-          msisdn: "1122334455"
-          apn: "apn1"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912347"
-          msisdn: "1122334455"
-          apn: "apn1"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912348"
-          msisdn: "1122334455"
-          apn: "apn1"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912349"
-          msisdn: "1122334455"
-          apn: "apn1"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-      mmes:
-        - id: 1
-          isdn: "19136246000"
-          unreachability: 1
diff --git a/deployment-configs/aether/apps/staging-omec-dp-cni.yaml b/deployment-configs/aether/apps/staging-omec-dp-cni.yaml
deleted file mode 100644
index f2b525d..0000000
--- a/deployment-configs/aether/apps/staging-omec-dp-cni.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-  sriov:
-    resourceList:
-      vfio:
-        s1uPfNames:
-          - ens1f0#0-3
-        sgiPfNames:
-          - ens1f0#4-7
diff --git a/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml b/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.yaml
deleted file mode 100644
index 7b0296d..0000000
--- a/deployment-configs/aether/apps/staging-omec-dp-staging-nokia.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: "192.168.251.43/24"
-    sgi:
-      device: "sgi-net"
-      ip: "192.168.250.43/24"
-    dpName: "dp-nokia"
-networks:
-  sgi:
-    gateway: "192.168.250.42"
diff --git a/deployment-configs/aether/apps/production-accelleran-cu-b7-onf-menlo.yaml b/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
similarity index 95%
rename from deployment-configs/aether/apps/production-accelleran-cu-b7-onf-menlo.yaml
rename to deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
index 8e3dda8..32e2b9c 100644
--- a/deployment-configs/aether/apps/production-accelleran-cu-b7-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
@@ -16,7 +16,7 @@
   epc:
     plmnId: 130501
   nats:
-    ip: 192.168.251.31
+    ip: 10.93.1.20
   mme:
     ip: 172.16.0.8
   progran:
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml
new file mode 100644
index 0000000..1495813
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml
@@ -0,0 +1,20 @@
+images:
+  tags:
+    initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
+    nats: registry.aether.opennetworking.org/aether/accelleran-cu-nats:v1.0.0
+    redis: registry.aether.opennetworking.org/aether/accelleran-cu-redis:v1.0.0
+    redisClient: registry.aether.opennetworking.org/aether/redis:5.0.6-alpine3.10
+    ric: registry.aether.opennetworking.org/aether/accelleran-cu-ric:v1.0.0
+    ricWeb: registry.aether.opennetworking.org/aether/accelleran-cu-ricweb:v1.0.0
+    depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
+  pullPolicy: IfNotPresent
+
+nodeSelectors:
+  enabled: true
+  accelleranCBRSCommon:
+    label: omec-dp-cbrs
+    value: enabled
+
+config:
+  nats:
+    ip: "10.93.1.20"
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml
new file mode 100644
index 0000000..d3c5375
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml
@@ -0,0 +1,23 @@
+images:
+  tags:
+    initCU: registry.aether.opennetworking.org/aether/pod-init:1.0.0
+    vranL3: registry.aether.opennetworking.org/aether/accelleran-cu-l3-tdd:v1.0.2
+    depCheck: registry.aether.opennetworking.org/aether/kubernetes-entrypoint:v0.3.1
+  pullPolicy: IfNotPresent
+
+nodeSelectors:
+  enabled: true
+  accelleranCBRSCU:
+    label: omec-dp-cbrs
+    value: enabled
+
+config:
+  mme:
+    ip: "10.168.0.192"
+  vranL3:
+    plmnId: "130501"
+    instanceId: "onfcell203"
+    tac: 203
+    ports:
+      s1ap:
+        nodePort: 31412
diff --git a/deployment-configs/aether/apps/staging/apps-cdn-local.yaml b/deployment-configs/aether/apps/staging/apps-cdn-local.yaml
new file mode 100644
index 0000000..1ebd7a0
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/apps-cdn-local.yaml
@@ -0,0 +1,32 @@
+images:
+  tags:
+    nginx: registry.aether.opennetworking.org/cdn-nginx:1.0.0
+  pullPolicy: IfNotPresent
+
+nodeSelectors:
+  enabled: true
+  nginx:
+    label: aether-apps
+    value: enabled
+
+config:
+  sriov:
+    enabled: false
+  nginx:
+    sgiInterface:
+      name: eth2
+      mtu: 1200
+  cdnRemotes:
+    - name: remote-gcp
+      ip: 10.168.0.200
+      port: 30935
+      streams:
+      - name: 480p
+        value: 480
+
+networks:
+  ipam: static
+  sgi:
+    subnet: 192.168.250.0/24
+    mask: 255.255.255.0
+    gateway: 192.168.250.254
diff --git a/deployment-configs/aether/apps/staging/omec-cp-b7.yaml b/deployment-configs/aether/apps/staging/omec-cp-b7.yaml
new file mode 100644
index 0000000..1ab7815
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/omec-cp-b7.yaml
@@ -0,0 +1,119 @@
+images:
+  tags:
+    hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
+    hss: "registry.aether.opennetworking.org/c3po-hss:1.1.4"
+    mme: "registry.aether.opennetworking.org/openmme:1.5.4-bad"
+    mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.2.2"
+    spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
+  pullPolicy: "Always"
+
+cassandra:
+  deploy: false
+
+resources:
+  enabled: true
+
+config:
+  coreDump:
+    enabled: true
+    path: /tmp/coredump
+  clusterDomain: "azure.central"
+  spgwc:
+    apn: internet
+    multiUpfs: true
+    s1uAddr: "192.168.251.4"
+    ueIpPool:
+      ip: 10.251.0.0
+      mask: 255.255.0.0
+    cfgFiles:
+      app_config.cfg: |
+        [GLOBAL]
+        NUM_DP_SELECTION_RULES = 2
+        [DP_SELECTION_RULE_1]
+        DPID = 1
+        DPNAME = dp1
+        MCC = 315
+        MNC = 100
+        TAC = 17
+        [DP_SELECTION_RULE_2]
+        DPID = 1
+        DPNAME = dp1
+        MCC = 315
+        MNC = 100
+        TAC = 18
+  mme:
+    cfgFiles:
+      config.json:
+        mme:
+          mcc:
+            dig1: 3
+            dig2: 1
+            dig3: 5
+          mnc:
+            dig1: 0
+            dig2: 1
+            dig3: 0
+  hss:
+    acl:
+      oldTls: "*.azure.central"
+    bootstrap:
+      enabled: true
+      users:
+        - imsi: "315010999912343"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912344"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912345"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912346"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912347"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912348"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912349"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "732111000000420"
+          msisdn: "1122334455"
+          apn: apn1
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "732111000000421"
+          msisdn: "1122334455"
+          apn: apn1
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+      mmes:
+        - id: 1
+          isdn: "19136246000"
+          unreachability: 1
diff --git a/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml b/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
new file mode 100644
index 0000000..febc008
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
@@ -0,0 +1,119 @@
+images:
+  tags:
+    hssdb: "registry.aether.opennetworking.org/c3po-hssdb:1.1.0"
+    hss: "registry.aether.opennetworking.org/c3po-hss:1.1.0"
+    mme: "registry.aether.opennetworking.org/openmme:1.5.4-bad"
+    mmeExporter: "registry.aether.opennetworking.org/mme-exporter:0.2.2"
+    spgwc: "registry.aether.opennetworking.org/ngic-cp:1.1.1"
+  pullPolicy: "Always"
+
+cassandra:
+  deploy: false
+
+resources:
+  enabled: true
+  mme:
+    requests:
+      cpu: 0.3
+      memory: 1Gi
+    limits:
+      cpu: 0.3
+      memory: 1Gi
+
+config:
+  clusterDomain: "staging.central"
+  spgwc:
+    apn: internet
+    multiUpfs: true
+    # can be any IP address, not used but crash without it
+    s1uAddr: "192.168.251.3"
+    cfgFiles:
+      app_config.cfg: |
+        [GLOBAL]
+        DNS_PRIMARY = 8.8.8.8
+        DNS_SECONDARY = 8.8.8.4
+        NUM_DP_SELECTION_RULES = 1
+        [DP_SELECTION_RULE_1]
+        DPID = 1
+        DPNAME = dp-staging
+        MCC = 315
+        MNC = 010
+        TAC = 203
+        DNS_PRIMARY = 1.1.1.1
+        DNS_SECONDARY = 8.8.8.8
+  mme:
+    cfgFiles:
+      config.json:
+        mme:
+          mcc:
+            dig1: 3
+            dig2: 1
+            dig3: 5
+          mnc:
+            dig1: 0
+            dig2: 1
+            dig3: 0
+  hss:
+    acl:
+      oldTls: "*.staging.central"
+    bootstrap:
+      enabled: true
+      users:
+        - imsi: "315010999912342"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912343"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912344"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912345"
+          msisdn: "1122334455"
+          apn: "internet"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912346"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912347"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010999912348"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010888812341"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+        - imsi: "315010888812342"
+          msisdn: "1122334455"
+          apn: "apn1"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
+      mmes:
+        - id: 1
+          isdn: "19136246000"
+          unreachability: 1
diff --git a/deployment-configs/aether/apps/staging/omec-dp-b7.yaml b/deployment-configs/aether/apps/staging/omec-dp-b7.yaml
new file mode 100644
index 0000000..90ddb5b
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/omec-dp-b7.yaml
@@ -0,0 +1,29 @@
+images:
+  tags:
+    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+  pullPolicy: "Always"
+
+nodeSelectors:
+  enabled: true
+  spgwu:
+    label: omec-dp-b7
+    value: enabled
+
+config:
+  spgwu:
+    multiUpfs: true
+    cpComm:
+      addr: "spgwc-headless.omec.svc.azure.central"
+    s1u:
+      device: "s1u-net"
+      # NOTE: set different IP for each edge
+      ip: "192.168.251.4/24"
+    sgi:
+      device: "sgi-net"
+      # NOTE: set different IP for each edge
+      ip: "192.168.250.4/24"
+    dpName: "dp1"
+networks:
+  sgi:
+    # NOTE: set correct gateway for each edge
+    gateway: "192.168.250.254"
diff --git a/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml b/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
new file mode 100644
index 0000000..88877c3
--- /dev/null
+++ b/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
@@ -0,0 +1,29 @@
+images:
+  tags:
+    spgwu: "registry.aether.opennetworking.org/ngic-dp:1.1.0"
+  pullPolicy: "Always"
+
+nodeSelectors:
+  enabled: true
+  spgwu:
+    label: omec-dp-cbrs
+    value: enabled
+
+config:
+  spgwu:
+    multiUpfs: true
+    cpComm:
+      addr: "spgwc-headless.omec.svc.staging.central"
+    s1u:
+      device: "s1u-net"
+      # NOTE: set different IP for each edge
+      ip: "192.168.251.3/24"
+    sgi:
+      device: "sgi-net"
+      # NOTE: set different IP for each edge
+      ip: "192.168.250.3/24"
+    dpName: "dp-staging"
+networks:
+  sgi:
+    # NOTE: set correct gateway for each edge
+    gateway: "192.168.250.254"