diff --git a/deployment-configs/aether/apps/staging/cassandra-azure.yaml b/deployment-configs/aether/apps/azure/cassandra.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/cassandra-azure.yaml
rename to deployment-configs/aether/apps/azure/cassandra.yaml
diff --git a/deployment-configs/aether/apps/staging/omec-cp-b7.yaml b/deployment-configs/aether/apps/azure/omec-cp-b7.yaml
similarity index 61%
rename from deployment-configs/aether/apps/staging/omec-cp-b7.yaml
rename to deployment-configs/aether/apps/azure/omec-cp-b7.yaml
index e6c95ac..79400de 100644
--- a/deployment-configs/aether/apps/staging/omec-cp-b7.yaml
+++ b/deployment-configs/aether/apps/azure/omec-cp-b7.yaml
@@ -2,10 +2,10 @@
   tags:
     hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
     hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
-    mme: "registry.central.aetherproject.net/openmme:1.5.5"
-    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
+    mme: "registry.central.aetherproject.net/openmme:1.7.1"
+    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
     spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
-  pullPolicy: "IfNotPresent"
+  pullPolicy: "Always"
 
 cassandra:
   deploy: false
@@ -30,23 +30,15 @@
         [GLOBAL]
         DNS_PRIMARY = 8.8.8.8
         DNS_SECONDARY = 8.8.4.4
-        NUM_DP_SELECTION_RULES = 2
+        NUM_DP_SELECTION_RULES = 1
         [DP_SELECTION_RULE_1]
         DPID = 1
-        DPNAME = dp1
+        DPNAME = dp-b7
         MCC = 315
-        MNC = 100
+        MNC = 010
         TAC = 17
         DNS_PRIMARY = 1.1.1.1
         DNS_SECONDARY = 8.8.8.8
-        [DP_SELECTION_RULE_2]
-        DPID = 1
-        DPNAME = dp1
-        MCC = 315
-        MNC = 100
-        TAC = 18
-        DNS_PRIMARY = 1.1.1.1
-        DNS_SECONDARY = 8.8.8.8
   mme:
     cfgFiles:
       config.json:
@@ -59,6 +51,48 @@
             dig1: 0
             dig2: 1
             dig3: 0
+      mme_exporter.json:
+        edges:
+        - id: onf-menlo-b48-1
+          tac: 202
+          edgeName: edge-onf-menlo
+        - id: onf-menlo-b48-2
+          tac: 203
+          edgeName: edge-onf-menlo
+        - id: intel-hillsboro-b48-1
+          tac: 101
+          edgeName: edge-intel-hillsboro
+        - id: onf-menlo-b7-1
+          tac: 17
+          edgeName: edge-demo
+        - id: onf-menlo-sercomm
+          tac: 18
+          edgeName: edge-demo
+        phoneTypes:
+        - imsi: 315010999912342
+          phoneType: "Pixel-4"
+        - imsi: 315010999912343
+          phoneType: "iPhone11-Pro-Max"
+        - imsi: 315010999912345
+          phoneType: "iPhone11"
+        - imsi: 315010999912346
+          phoneType: "Sercomm-Dongle"
+        - imsi: 315010999912347
+          phoneType: "Sercomm-Camera"
+        - imsi: 315010999912348
+          phoneType: "Sercomm-Dongle"
+        - imsi: 315010999912349
+          phoneType: "iPhone11-Pro"
+        - imsi: 315010999912350
+          phoneType: "iPhone11-Pro"
+        - imsi: 315010999912352
+          phoneType: "iPhone11"
+        - imsi: 315010999912353
+          phoneType: "iPhone11-Pro-Max"
+        - imsi: 315010999912354
+          phoneType: "iPhone11"
+        - imsi: 315010999912355
+          phoneType: "Pixel-4"
   hss:
     acl:
       oldTls: "*.azure.central"
@@ -67,55 +101,55 @@
       users:
         - imsi: "315010999912343"
           msisdn: "1122334455"
-          apn: "apn1"
+          apn: "internet"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "315010999912344"
           msisdn: "1122334455"
-          apn: "apn1"
+          apn: "internet"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "315010999912345"
           msisdn: "1122334455"
-          apn: "apn1"
+          apn: "internet"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "315010999912346"
           msisdn: "1122334455"
-          apn: "apn1"
+          apn: "internet"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "315010999912347"
           msisdn: "1122334455"
-          apn: "apn1"
+          apn: "internet"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "315010999912348"
           msisdn: "1122334455"
-          apn: "apn1"
+          apn: "internet"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "315010999912349"
           msisdn: "1122334455"
-          apn: "apn1"
+          apn: "internet"
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "732111000000420"
           msisdn: "1122334455"
-          apn: apn1
+          apn: internet
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
         - imsi: "732111000000421"
           msisdn: "1122334455"
-          apn: apn1
+          apn: internet
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
@@ -125,6 +159,12 @@
           key: "000102030405060708090a0b0c0d0e0f"
           opc: "69d5c2eb2e2e624750541d3bbc692ba5"
           sqn: 135
+        - imsi: "315010999912351"
+          msisdn: "1122334455"
+          apn: "internet"
+          key: "000102030405060708090a0b0c0d0e0f"
+          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+          sqn: 135
       mmes:
         - id: 1
           isdn: "19136246000"
diff --git a/deployment-configs/aether/apps/production/cassandra.yaml b/deployment-configs/aether/apps/gcp-prd/cassandra.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/cassandra.yaml
rename to deployment-configs/aether/apps/gcp-prd/cassandra.yaml
diff --git a/deployment-configs/aether/apps/staging/mcord-services.yaml b/deployment-configs/aether/apps/gcp-prd/mcord-services.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/mcord-services.yaml
rename to deployment-configs/aether/apps/gcp-prd/mcord-services.yaml
diff --git a/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml b/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
new file mode 100644
index 0000000..f3c63b1
--- /dev/null
+++ b/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
@@ -0,0 +1,143 @@
+images:
+  tags:
+    hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
+    hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
+    mme: "registry.central.aetherproject.net/openmme:1.7.1"
+    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
+    spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
+  pullPolicy: "IfNotPresent"
+
+cassandra:
+  deploy: false
+
+resources:
+  enabled: true
+  mme:
+    requests:
+      cpu: 0.3
+      memory: 1Gi
+    limits:
+      cpu: 0.3
+      memory: 1Gi
+
+config:
+  coreDump:
+    enabled: true
+    path: /tmp/coredump
+  clusterDomain: "product.central"
+  spgwc:
+    apn: internet
+    multiUpfs: true
+    s1uAddr: "192.168.251.7"
+    cfgFiles:
+      app_config.cfg: |
+        [GLOBAL]
+        DNS_PRIMARY = 8.8.8.8
+        DNS_SECONDARY = 8.8.4.4
+        NUM_DP_SELECTION_RULES = 4
+        [DP_SELECTION_RULE_1]
+        DPID = 1
+        DPNAME = dp-staging
+        MCC = 315
+        MNC = 010
+        TAC = 202
+        DNS_PRIMARY = 1.1.1.1
+        DNS_SECONDARY = 8.8.8.8
+        [DP_SELECTION_RULE_2]
+        DPID = 2
+        DPNAME = dp-intel
+        MCC = 315
+        MNC = 010
+        TAC = 101
+        DNS_PRIMARY = 10.212.87.15
+        DNS_SECONDARY = 10.212.87.16
+        [DP_SELECTION_RULE_3]
+        DPID = 3
+        DPNAME = dp-demo
+        MCC = 315
+        MNC = 010
+        TAC = 18
+        DNS_PRIMARY = 1.1.1.1
+        DNS_SECONDARY = 8.8.8.8
+        [DP_SELECTION_RULE_4]
+        DPID = 3
+        DPNAME = dp-demo
+        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
+      mme_exporter.json:
+        edges:
+        - id: onf-menlo-b48-1
+          tac: 202
+          edgeName: edge-onf-menlo
+        - id: onf-menlo-b48-2
+          tac: 203
+          edgeName: edge-demo
+        - id: intel-hillsboro-b48-1
+          tac: 101
+          edgeName: edge-intel-hillsboro
+        - id: onf-menlo-b7-1
+          tac: 17
+          edgeName: edge-onf-menlo
+        - id: onf-menlo-sercomm
+          tac: 18
+          edgeName: edge-demo
+        phoneTypes:
+        - imsi: 315010999912342
+          phoneType: "Pixel-4"
+        - imsi: 315010999912343
+          phoneType: "iPhone11-Pro-Max"
+        - imsi: 315010999912345
+          phoneType: "iPhone11"
+        - imsi: 315010999912346
+          phoneType: "Sercomm-Dongle"
+        - imsi: 315010999912347
+          phoneType: "Sercomm-Camera"
+        - imsi: 315010999912348
+          phoneType: "Sercomm-Dongle"
+        - imsi: 315010999912349
+          phoneType: "iPhone11-Pro"
+        - imsi: 315010999912350
+          phoneType: "iPhone11-Pro"
+        - imsi: 315010999912352
+          phoneType: "iPhone11"
+        - imsi: 315010999912353
+          phoneType: "iPhone11-Pro-Max"
+        - imsi: 315010999912354
+          phoneType: "iPhone11"
+        - imsi: 315010999912355
+          phoneType: "Pixel-4"
+  hss:
+    acl:
+      oldTls: "*.product.central"
+    bootstrap:
+      enabled: true
+      apn: "internet"
+      key: "000102030405060708090a0b0c0d0e0f"
+      opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+      sqn: 135
+      users:
+        - imsiStart: "315010888812340"
+          msisdnStart: "8888334455"
+          count: 100
+        - imsiStart: "315010999912340"
+          msisdnStart: "9999334455"
+          count: 100
+      mmes:
+        - id: 1
+          isdn: "19136246000"
+          unreachability: 1
diff --git a/deployment-configs/aether/apps/staging/cassandra-gcp.yaml b/deployment-configs/aether/apps/gcp-stg/cassandra.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/cassandra-gcp.yaml
rename to deployment-configs/aether/apps/gcp-stg/cassandra.yaml
diff --git a/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml b/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml
new file mode 100644
index 0000000..30de3c0
--- /dev/null
+++ b/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml
@@ -0,0 +1,143 @@
+images:
+  tags:
+    hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
+    hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
+    mme: "registry.central.aetherproject.net/openmme:1.7.1"
+    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
+    spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
+  pullPolicy: "IfNotPresent"
+
+cassandra:
+  deploy: false
+
+resources:
+  enabled: true
+  mme:
+    requests:
+      cpu: 0.3
+      memory: 1Gi
+    limits:
+      cpu: 0.3
+      memory: 1Gi
+
+config:
+  coreDump:
+    enabled: true
+    path: /tmp/coredump
+  clusterDomain: "staging.central"
+  spgwc:
+    apn: internet
+    multiUpfs: true
+    s1uAddr: "192.168.251.7"
+    cfgFiles:
+      app_config.cfg: |
+        [GLOBAL]
+        DNS_PRIMARY = 8.8.8.8
+        DNS_SECONDARY = 8.8.4.4
+        NUM_DP_SELECTION_RULES = 4
+        [DP_SELECTION_RULE_1]
+        DPID = 1
+        DPNAME = dp-staging
+        MCC = 315
+        MNC = 010
+        TAC = 202
+        DNS_PRIMARY = 1.1.1.1
+        DNS_SECONDARY = 8.8.8.8
+        [DP_SELECTION_RULE_2]
+        DPID = 2
+        DPNAME = dp-intel
+        MCC = 315
+        MNC = 010
+        TAC = 101
+        DNS_PRIMARY = 10.212.87.15
+        DNS_SECONDARY = 10.212.87.16
+        [DP_SELECTION_RULE_3]
+        DPID = 3
+        DPNAME = dp-demo
+        MCC = 315
+        MNC = 010
+        TAC = 18
+        DNS_PRIMARY = 1.1.1.1
+        DNS_SECONDARY = 8.8.8.8
+        [DP_SELECTION_RULE_4]
+        DPID = 3
+        DPNAME = dp-demo
+        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
+      mme_exporter.json:
+        edges:
+        - id: onf-menlo-b48-1
+          tac: 202
+          edgeName: edge-onf-menlo
+        - id: onf-menlo-b48-2
+          tac: 203
+          edgeName: edge-demo
+        - id: intel-hillsboro-b48-1
+          tac: 101
+          edgeName: edge-intel-hillsboro
+        - id: onf-menlo-b7-1
+          tac: 17
+          edgeName: edge-onf-menlo
+        - id: onf-menlo-sercomm
+          tac: 18
+          edgeName: edge-demo
+        phoneTypes:
+        - imsi: 315010999912342
+          phoneType: "Pixel-4"
+        - imsi: 315010999912343
+          phoneType: "iPhone11-Pro-Max"
+        - imsi: 315010999912345
+          phoneType: "iPhone11"
+        - imsi: 315010999912346
+          phoneType: "Sercomm-Dongle"
+        - imsi: 315010999912347
+          phoneType: "Sercomm-Camera"
+        - imsi: 315010999912348
+          phoneType: "Sercomm-Dongle"
+        - imsi: 315010999912349
+          phoneType: "iPhone11-Pro"
+        - imsi: 315010999912350
+          phoneType: "iPhone11-Pro"
+        - imsi: 315010999912352
+          phoneType: "iPhone11"
+        - imsi: 315010999912353
+          phoneType: "iPhone11-Pro-Max"
+        - imsi: 315010999912354
+          phoneType: "iPhone11"
+        - imsi: 315010999912355
+          phoneType: "Pixel-4"
+  hss:
+    acl:
+      oldTls: "*.staging.central"
+    bootstrap:
+      enabled: true
+      apn: "internet"
+      key: "000102030405060708090a0b0c0d0e0f"
+      opc: "69d5c2eb2e2e624750541d3bbc692ba5"
+      sqn: 135
+      users:
+        - imsiStart: "315010888812340"
+          msisdnStart: "8888334455"
+          count: 100
+        - imsiStart: "315010999912340"
+          msisdnStart: "9999334455"
+          count: 100
+      mmes:
+        - id: 1
+          isdn: "19136246000"
+          unreachability: 1
diff --git a/deployment-configs/aether/apps/production/cdn-remote.yaml b/deployment-configs/aether/apps/global/cdn-remote.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/cdn-remote.yaml
rename to deployment-configs/aether/apps/global/cdn-remote.yaml
diff --git a/deployment-configs/aether/apps/production/global-docker-registry.yaml b/deployment-configs/aether/apps/global/global-docker-registry.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/global-docker-registry.yaml
rename to deployment-configs/aether/apps/global/global-docker-registry.yaml
diff --git a/deployment-configs/aether/apps/production/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/global-nem-monitoring.yaml
rename to deployment-configs/aether/apps/global/global-nem-monitoring.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-common-intel-hillsboro.yaml b/deployment-configs/aether/apps/intel/accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-common-intel-hillsboro.yaml
rename to deployment-configs/aether/apps/intel/accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-intel-hillsboro.yaml b/deployment-configs/aether/apps/intel/accelleran-cbrs-cu.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-cu-intel-hillsboro.yaml
rename to deployment-configs/aether/apps/intel/accelleran-cbrs-cu.yaml
diff --git a/deployment-configs/aether/apps/production/nem-monitoring.yaml b/deployment-configs/aether/apps/intel/nem-monitoring.yaml
similarity index 93%
copy from deployment-configs/aether/apps/production/nem-monitoring.yaml
copy to deployment-configs/aether/apps/intel/nem-monitoring.yaml
index 4b62784..46dc58a 100644
--- a/deployment-configs/aether/apps/production/nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/intel/nem-monitoring.yaml
@@ -18,7 +18,7 @@
     # NOTE: set unique datacenter name for each clusters
     global:
       external_labels:
-        datacenter: "edge-onf-menlo"
+        datacenter: "edge-onf-menlo-staging"
 
 grafana:
   fullnameOverride: "nem-monitoring-grafana"
diff --git a/deployment-configs/aether/apps/intel/omec-dp-cni.yaml b/deployment-configs/aether/apps/intel/omec-dp-cni.yaml
new file mode 100644
index 0000000..9e0ca61
--- /dev/null
+++ b/deployment-configs/aether/apps/intel/omec-dp-cni.yaml
@@ -0,0 +1,8 @@
+config:
+  sriov:
+    resourceList:
+      vfio:
+        s1uPfNames:
+          - data#0-3
+        sgiPfNames:
+          - data#4-7
diff --git a/deployment-configs/aether/apps/production/omec-dp-intel-hillsboro.yaml b/deployment-configs/aether/apps/intel/omec-dp.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/omec-dp-intel-hillsboro.yaml
rename to deployment-configs/aether/apps/intel/omec-dp.yaml
diff --git a/deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-b7-cu.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/accelleran-b7-cu.yaml
rename to deployment-configs/aether/apps/menlo-demo/accelleran-b7-cu.yaml
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/accelleran-cbrs-common.yaml
rename to deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/accelleran-cbrs-cu.yaml
rename to deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
diff --git a/deployment-configs/aether/apps/staging/cdn-local.yaml b/deployment-configs/aether/apps/menlo-demo/cdn-local.yaml
similarity index 96%
rename from deployment-configs/aether/apps/staging/cdn-local.yaml
rename to deployment-configs/aether/apps/menlo-demo/cdn-local.yaml
index c22efe1..bc29386 100644
--- a/deployment-configs/aether/apps/staging/cdn-local.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/cdn-local.yaml
@@ -15,7 +15,7 @@
   nginx:
     sgiInterface:
       name: eth2
-      mtu: 1200
+      mtu: 1450
   cdnRemotes:
     - name: remote-gcp
       ip: 10.168.0.200
diff --git a/deployment-configs/aether/apps/production/nem-monitoring.yaml b/deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
similarity index 93%
rename from deployment-configs/aether/apps/production/nem-monitoring.yaml
rename to deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
index 4b62784..8e23ee9 100644
--- a/deployment-configs/aether/apps/production/nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
@@ -18,7 +18,7 @@
     # NOTE: set unique datacenter name for each clusters
     global:
       external_labels:
-        datacenter: "edge-onf-menlo"
+        datacenter: "edge-onf-menlo-demo"
 
 grafana:
   fullnameOverride: "nem-monitoring-grafana"
diff --git a/deployment-configs/aether/apps/staging/omec-dp-b7.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
similarity index 96%
rename from deployment-configs/aether/apps/staging/omec-dp-b7.yaml
rename to deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
index a02cbb1..88b0510 100644
--- a/deployment-configs/aether/apps/staging/omec-dp-b7.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
@@ -22,7 +22,7 @@
       device: "sgi-net"
       # NOTE: set different IP for each edge
       ip: "192.168.250.4/24"
-    dpName: "dp1"
+    dpName: "dp-b7"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
similarity index 87%
rename from deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
rename to deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
index 7c24694..06d04f8 100644
--- a/deployment-configs/aether/apps/staging/omec-dp-cbrs.yaml
+++ b/deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
@@ -13,7 +13,7 @@
   spgwu:
     multiUpfs: true
     cpComm:
-      addr: "spgwc-headless.omec.svc.staging.central"
+      addr: "spgwc-headless.omec.svc.product.central"
     s1u:
       device: "s1u-net"
       # NOTE: set different IP for each edge
@@ -22,7 +22,7 @@
       device: "sgi-net"
       # NOTE: set different IP for each edge
       ip: "192.168.250.3/24"
-    dpName: "dp-staging"
+    dpName: "dp-demo"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/production/omec-dp-cni.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-cni.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/omec-dp-cni.yaml
rename to deployment-configs/aether/apps/menlo-demo/omec-dp-cni.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-common-onf-menlo.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-common-onf-menlo.yaml
rename to deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo-b42.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu-b42.yaml
similarity index 100%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo-b42.yaml
rename to deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu-b42.yaml
diff --git a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
similarity index 94%
rename from deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml
rename to deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
index 85786ab..dc93f4a 100644
--- a/deployment-configs/aether/apps/production/accelleran-cbrs-cu-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
@@ -13,7 +13,7 @@
 
 config:
   mme:
-    ip: "10.168.0.204"
+    ip: "10.168.0.194"
   vranL3:
     plmnId: "130501"
     instanceId: "onfcell202"
diff --git a/deployment-configs/aether/apps/staging/cdn-local.yaml b/deployment-configs/aether/apps/menlo-stg/cdn-local.yaml
similarity index 91%
copy from deployment-configs/aether/apps/staging/cdn-local.yaml
copy to deployment-configs/aether/apps/menlo-stg/cdn-local.yaml
index c22efe1..df762b3 100644
--- a/deployment-configs/aether/apps/staging/cdn-local.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/cdn-local.yaml
@@ -15,7 +15,7 @@
   nginx:
     sgiInterface:
       name: eth2
-      mtu: 1200
+      mtu: 1450
   cdnRemotes:
     - name: remote-gcp
       ip: 10.168.0.200
@@ -29,4 +29,4 @@
   sgi:
     subnet: 192.168.250.0/24
     mask: 255.255.255.0
-    gateway: 192.168.250.254
+    gateway: 192.168.250.1
diff --git a/deployment-configs/aether/apps/production/nem-monitoring.yaml b/deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
similarity index 93%
copy from deployment-configs/aether/apps/production/nem-monitoring.yaml
copy to deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
index 4b62784..46dc58a 100644
--- a/deployment-configs/aether/apps/production/nem-monitoring.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
@@ -18,7 +18,7 @@
     # NOTE: set unique datacenter name for each clusters
     global:
       external_labels:
-        datacenter: "edge-onf-menlo"
+        datacenter: "edge-onf-menlo-staging"
 
 grafana:
   fullnameOverride: "nem-monitoring-grafana"
diff --git a/deployment-configs/aether/apps/staging/omec-dp-cni.yaml b/deployment-configs/aether/apps/menlo-stg/omec-dp-cni.yaml
similarity index 100%
rename from deployment-configs/aether/apps/staging/omec-dp-cni.yaml
rename to deployment-configs/aether/apps/menlo-stg/omec-dp-cni.yaml
diff --git a/deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml b/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
similarity index 86%
rename from deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml
rename to deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
index d221605..f069c0a 100644
--- a/deployment-configs/aether/apps/production/omec-dp-onf-menlo.yaml
+++ b/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
@@ -13,7 +13,7 @@
   spgwu:
     multiUpfs: true
     cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
+      addr: "spgwc-headless.omec.svc.staging.central"
     s1u:
       device: "s1u-net"
       # NOTE: set different IP for each edge
@@ -22,7 +22,7 @@
       device: "sgi-net"
       # NOTE: set different IP for each edge
       ip: "192.168.250.7/24"
-    dpName: "dp-menlo"
+    dpName: "dp-staging"
 networks:
   sgi:
     # NOTE: set correct gateway for each edge
diff --git a/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml b/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml
deleted file mode 100644
index 722ebb9..0000000
--- a/deployment-configs/aether/apps/production/cdn-local-onf-menlo.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-images:
-  tags:
-    nginx: registry.central.aetherproject.net/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.31
diff --git a/deployment-configs/aether/apps/production/omec-cp.yaml b/deployment-configs/aether/apps/production/omec-cp.yaml
deleted file mode 100644
index 7fc9246..0000000
--- a/deployment-configs/aether/apps/production/omec-cp.yaml
+++ /dev/null
@@ -1,135 +0,0 @@
-images:
-  tags:
-    hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
-    hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
-    mme: "registry.central.aetherproject.net/openmme:1.5.5"
-    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
-    spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
-  pullPolicy: "IfNotPresent"
-
-cassandra:
-  deploy: false
-
-resources:
-  enabled: true
-  mme:
-    requests:
-      cpu: 0.3
-      memory: 1Gi
-    limits:
-      cpu: 0.3
-      memory: 1Gi
-
-config:
-  coreDump:
-    enabled: true
-    path: /tmp/coredump
-  clusterDomain: "product.central"
-  spgwc:
-    apn: internet
-    multiUpfs: true
-    s1uAddr: "192.168.251.7"
-    cfgFiles:
-      app_config.cfg: |
-        [GLOBAL]
-        DNS_PRIMARY = 8.8.8.8
-        DNS_SECONDARY = 8.8.4.4
-        NUM_DP_SELECTION_RULES = 2
-        [DP_SELECTION_RULE_1]
-        DPID = 1
-        DPNAME = dp-menlo
-        MCC = 315
-        MNC = 010
-        TAC = 202
-        DNS_PRIMARY = 1.1.1.1
-        DNS_SECONDARY = 8.8.8.8
-        [DP_SELECTION_RULE_2]
-        DPID = 2
-        DPNAME = dp-intel
-        MCC = 315
-        MNC = 010
-        TAC = 101
-        DNS_PRIMARY = 10.212.87.15
-        DNS_SECONDARY = 10.212.87.16
-  mme:
-    cfgFiles:
-      config.json:
-        mme:
-          mcc:
-            dig1: 3
-            dig2: 1
-            dig3: 5
-          mnc:
-            dig1: 0 
-            dig2: 1
-            dig3: 0
-  hss:
-    acl:
-      oldTls: "*.product.central"
-    bootstrap:
-      enabled: true
-      users:
-        - imsi: "315010999912342"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912343"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912344"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912345"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912346"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912347"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912348"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010888812341"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010888812342"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912350"
-          msisdn: "1122334455"
-          apn: "internet"
-          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
deleted file mode 100644
index 6314b66..0000000
--- a/deployment-configs/aether/apps/staging/omec-cp-cbrs.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-images:
-  tags:
-    hssdb: "registry.central.aetherproject.net/c3po-hssdb:1.1.0"
-    hss: "registry.central.aetherproject.net/c3po-hss:1.1.4"
-    mme: "registry.central.aetherproject.net/openmme:1.5.5"
-    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.2.2"
-    spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
-  pullPolicy: "IfNotPresent"
-
-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.4.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: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912343"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912344"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912345"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912346"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912347"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912348"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010888812341"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010888812342"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912350"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-      mmes:
-        - id: 1
-          isdn: "19136246000"
-          unreachability: 1
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
index 11146da..7744ab9 100644
--- a/deployment-configs/infosys-pod.yaml
+++ b/deployment-configs/infosys-pod.yaml
@@ -52,7 +52,7 @@
       ip: '192.168.10.25'
       user: 'voltharg'
       pass: 'voltharg'
-      dp_iface_name: 'enp0s3'
+      dp_iface_name: 'ens10'
       container_type: null
       container_name: null
       onu: 'ISKT71e82118'
diff --git a/kubernetes-configs/infosys-pod.conf b/kubernetes-configs/infosys-pod.conf
index c072e2c..37672f8 100644
--- a/kubernetes-configs/infosys-pod.conf
+++ b/kubernetes-configs/infosys-pod.conf
@@ -1,7 +1,7 @@
 apiVersion: v1
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ESXhNekEzTkRneU1Gb1hEVE13TURJeE1EQTNORGd5TUZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTVQ4CitwbXgvWCs4SGplSjFaQmdwU0tnb2tKbWorL0l6NkVDZ0oyQ1IrUzh6cTVkajliSUwwM09DZVJ3Mlh5cW50SjEKTC94dzdieGY2RWxTcXByT0V3U1UrRjRKRHN6UU0rVjIySmNBaVZybjZxTStMMitKTWVGYk9KaGg1SWVQK0o5aApld1pSWTdYWDRXTUpEUEo2OW9EL3NvOHBuaENNQU95c0JkMEJ3ZlR0bmVzTWQ3R0RsNkNjbkxFUkdVN3A3dS9RCmY1cFRBMHRvaXF6WTEzU0NjaFlnRUZ5MFEydVVoYS9udERMN2swNFRRS09IdGxmcFo4WlpsSlk2Zy90UEtPRVIKWkUvNU10dndpb0J6OGxJNDVwK0hva29lUnhlZlBSaG5maHgzT1owRTNQWXFBendvWG8vVTV5ZG81MHp6SXJSawpMdklmVUI5YzZWbmFXc293cU9VQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFFMEk1dUFqRjlLQVJqWGpCQW5JaFBEMUJKaUwKRE5wdi9OMmZTZXl3eitwT2RDWmlzYkZPbnhBOFBwMTdtdWpCRVg1d1ptUWt2TlJoaFVtMDVaNWdIbjE3Qm5YRApmM0RGYzkwZFZWODl1c3M4YVE2TDhkaVhMOHVZcWd1M0llV3VRRzNtcFVNZDJwN3FkV0daeHI3TDNXUm9wTjhGCmE2cUhhbEQvTFRxcW83eEV2a0lNZmV2YkFDMUZnT0tJT0pZVS9RRFg5T0FubFJrYW5vdlFWMmFQUm56ZTJ0Z2IKK1YyTkpYQVMvT1BkNVF2Z2tiV0l6WEpMUlg4d2xidkI3bEhWeDZGaGNKWWRxVEFCcHNWYXFjcU5lZjJRZEg4TQpETHRrYlNVSWhPV0NoZVJDbmJoK012UzZOUVloL2doV0hPRDU1TlFiNDlFNXFLYlhNaHlOUkRNTjZLWT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ESXlPREUxTVRjeE5Gb1hEVE13TURJeU5URTFNVGN4TkZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTnRoCmQwd1dqbmF4bW5SdGlhdG4xWXN5dE83d1RTRDVxUTlQaTNRbU1uVGpJRUs0UjBxYVZwQUo0UnFYUWorcjUrN0IKN2M0dWJVSmMrZ0diTFk1OURJU2xhYlhlSXh2MzEzMTlNNVc3NVlnWHhEQWp2a2dFNlVIbjlkMDB6S3pncS9qNwpOeW5wVDE4Q1hjcWFDL1BvTWxmcktTbzJCSFVjZUdUUjJsREx4Y1QrdUVSaWIwM1RzOFcvamJYQTIzTGlnNXkvCkdqVVVobzY3V1BBOEF3bXd0aUJOTHplV0ZhTnp6NHcwOFBCVjd6RlhocjNrZWdMTVY4TDVEVnBqeGJBanVHM0MKeStTdmRrTzQ0SGhJV3JYZFlnb2Vxb2JpMkcxaXA1SkpieHRYSTFBWjFSdTFWZ3lVeEUwbWxyYXFaalAxTnI3Zgo1MTlPelMwNjM1K2dPUnhRaUhVQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFBK3VyOUFrWXdIYW9zbFBGVDdSY09rVEZNR2YKaldXV0s1azdhc3l4MGhuYkJNNURsTnRUZElsU25oL2pCQnh2TXlzRkJKbGx4RXdFMzFrRVIvOXJNbmxvUWtONAp3UGdKb0VtQ1BVZWp6MEFOWWFEeFF4TlB5QXhPQzhLM1h5TFNnam9zOUlGcWJ2cFVkb0lWMUhRdlBSN0VHcXFQCmFxbnNEaFNWRHMzcWk2N0QrYXdTS2w4RG4wbmFYMGdUWEFOcGNDdHpva280RjIxUjJMa2NadktvbHA3SHE5ZTcKV1BBcmJQZEw0R1lDa3lTWHVmS3l6dWF3NDJnZkR2amRpK084TWpPbmVSU2RxMzMwTGxWWFlocGlKc2FOcWVoagpoakx1MGMyT0d4dWtsV3IxTmx5VjBQOEh6M25aTlIxTDRpMWRvSjVURGoxc2hSanlxME1jdWpvL0pvVT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
     server: https://192.168.10.21:6443
   name: kubernetes
 contexts:
@@ -15,5 +15,5 @@
 users:
 - name: kubernetes-admin
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJYlp1MFczU1Y4ekV3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBeU1UTXdOelE0TWpCYUZ3MHlNVEF5TVRJd056UTRNak5hTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXUwRGFTZTlVU1J4bUt3VVQKVFlscE5PWlhpQWl6ZlROTkJ3eWVxclZqNDFjbUZLR21wUU96bVVZNmlpcWs0eis2ZnIvOGpnZ3ozM3pVUWNCdQpWZm53Ty9QN0syRzNTem5DRWlFdnUydUZUdCtCMmZLUko0WDJKU2xnSkZzMEIydmN6cFdGVFc5aGpEdzRzQkRCCkxQcnYzZDd2bmxrcTJnLy9WMDhKMHQ4cmJmSGNsdWdldnJHaTNLTWFiS1dFbnZjdDVPTGJQZTAxQmtyaUdNWXAKWFhLUDlybDdYUjNkS1dDdVhiOTFSQWJKMWxvT3BDOFU0cVdHcXVsNm85dEJUSUZ4YTZIUkx3Z09TazBGbmpnSQpzblRJWkpTaVluZnVRbDArOGFPY2lCS0ozb2pJOEUzY0tRenk3eGV3VVZJamtsQ2t0OHRxQ2F2cG5iYjlFRTBtCi9qdVJkd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNQnF1L21sTXRERnVHeTdaK2NkSDZxNGVKZHE0eVlFT2laUAowM3JZS3MxTDE2R1NGU1Q0cTUzemp6c2IvQ3ZZN01rekhqTUwzUlpvSVVzM0FQTGFxNkVWSjF1MEE5N2xSM2JkClRDRTFtbW93TFpKWU02d2FMbVJ2RGE0dFNtenFpdG84UFFWRTh6VmU5ZzljMTB4WU81a2tZckUvSVhqc25hQnYKNlNlcWtFNmp3NGNyRFJPeGFsQ3FnU2hjbWZtakppK1ZDV3liTkNaTXltcW8vQUx0QUU1UnJQVGYzOWFFaXpLVQpDSE9UNmJCTS9vY2ZKMzNGWTB4V3ZwOC9uMzJOZnZWZS90L1hCMWk2UU1YbDNKb0s1SUd1UFl6R3hCMDc0YU1mCjFOTFVSM0Y5K3dYOURhQUxTZWRqS2ZoaWxFTGxTQTJLTGhndWtCUUFzTWRVakdiK1VVcz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBdTBEYVNlOVVTUnhtS3dVVFRZbHBOT1pYaUFpemZUTk5Cd3llcXJWajQxY21GS0dtCnBRT3ptVVk2aWlxazR6KzZmci84amdnejMzelVRY0J1VmZud08vUDdLMkczU3puQ0VpRXZ1MnVGVHQrQjJmS1IKSjRYMkpTbGdKRnMwQjJ2Y3pwV0ZUVzloakR3NHNCREJMUHJ2M2Q3dm5sa3EyZy8vVjA4SjB0OHJiZkhjbHVnZQp2ckdpM0tNYWJLV0VudmN0NU9MYlBlMDFCa3JpR01ZcFhYS1A5cmw3WFIzZEtXQ3VYYjkxUkFiSjFsb09wQzhVCjRxV0dxdWw2bzl0QlRJRnhhNkhSTHdnT1NrMEZuamdJc25USVpKU2lZbmZ1UWwwKzhhT2NpQktKM29qSThFM2MKS1F6eTd4ZXdVVklqa2xDa3Q4dHFDYXZwbmJiOUVFMG0vanVSZHdJREFRQUJBb0lCQUFRSmlPdFJLcXNNM3JNTQp2L2JMQUthd1ZMRE5Kem1LMHAxVlMxSjQ2TGR0R0pnWFNDV0VwK21sRnZ3Rm9WcDQ5RWRwVWtPcHI1eWc3MTZmCmpJRjBDeGJ2MHJtRHVOVDVZTkxOUGw4M0dUK3pGL1NnQXpzcjZ6dXY0YS9HKzU4eFZ5aHBGdCt0aUJmaThJSHoKU29ieXZoczFoRXNRdHhqT2dYM2JhV1hQZy9zeDAxTGk3Qmw0MWg4N2JNM0wyUlZWNmswY2Y2dUlhSEM1dVF6SwpXMTJCUFMrRWdlZ3pHNEJSUUlSMDNJc3IwNG5DYVNuRjhPNWdJektKRkM0SjNLQkIvYWU0V0VYVWZnK1ZIOEozCnUvdG5DTjF5eDkzdEZPZUQxQi8vWXVsWkVEQkdySEJHTVZVdnQ4Q0FDY3ZvQlV4eldBS0VMd1krZ2t4SFR6dkYKdkVhdmdBa0NnWUVBMVJNandqK0tUMjcvbEc0S01GbnhKNndVNzZtUG1XSU1HL1pnTlZia1laZFNxcXFjVk1aUwpHQUZuWkJTU1NGdGplRDgwSDJudldxR2NPbk04Rk41cWUyK052TjB3RGNIRkdld0s5aFhyam9mNnBweGdoYit2CmdpL2tZMEVrYkRhZDZrWkJ2Y293N1Bqdit3N2k4cHErUkNyMzBwR25UZXJBRHF0MTQySEF3R1VDZ1lFQTRQb0gKbEdpRXRGZ3BPVkZKR1A0QTFnWksrRy92ZFdPM3FJS0hRdHlZTTZ1N1dOQUk3SzVLQ3Vpdmt4VHZ3ZDlYNUhLTQpyVTU4UmdEcTdLV25OTDRPcElJbDFmYkJYLysxNEltQTRBbjJiUXZ6eWdEN2liMFF1VmlTcTlQamdyQ2ppZUpIClFMbWViMTJrMkpsQURIY3ZBb3UwVk9ad0lMaEtMY3BON01DUzlxc0NnWUFxYk5JczVpdnEzd1lDanRwMmdDSVYKTFIxS0R1L3BzVzBKMEVlZHR6eG45aEplcXZQUHFXRkZLRnBtd2ZYU2RHZmMxSERUWkd0bEYxS2RETDdFeFBoYwp0WHg2UTJ4REFQYjJ6MW5yWDdmMFBEejdHWjNhWTYxVmRhVzY0WWlZQjFQd0JxY21XL0RiN2tFU013ZWJHSmFUCnloNW9EZHBMR0ZlL1ZBSjRFTW1wUlFLQmdGaXYxOHNXUkxIL1N3andWVHVIN2ZadzlwN25LV09DVXNVWDU1QmcKKzVMcThPaTY0Ym5EbnlhYndaTGVud0V6TlNlMlRHU0pXdzRSa0lxSFp0bXd6bjdsVzFyMGNoaVE2amJBbmRBegp2VFFSa1NJaHJ3Y0dSQkI4clIwVlkwdUNySVZQY1QwL3J3aEJ4eGtubUlzUmRMT3hOUDUrOU5iQkwyVExxbHBaCk05WVBBb0dBREsyVDFVMk10Rm93VHNhc3lmRXpobEtNZ1VRbmd0YVk0QStlT0sxYzJrUERIdFd4anVmT0lOWUoKQlZPY2szVDZPU1VBMk50c2IrQS9KZ3dnUnVIK04yQkhzaHZ5N29IMmtxMHdRTDlKYkx5L3pDSzNKT05GRHJDcQpYSG9FeWRwTHVDVGgxWHI2ZHR2TDE0OXBoNVpvS2NJSzBCZUJwdjVSN0Fab2lJaXlDRkk9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJVXlmTjRNdDBLQW93RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBeU1qZ3hOVEUzTVRSYUZ3MHlNVEF5TWpjeE5URTNNVFZhTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXlMWUZjalV4cXhRb0xkOEwKR09uUFkzVW9CYjhwL0JKblJiUiszTnJVT1gwYmpEcEpzRjlNamJpaVljV1FqWUNiRFlPWTg1Mm9ITSs3RXhuQQovUGJGZGZYakN1ZDVEYVZaZ2JMZ2QrWnFISkErSUV4U3hESDdxQkw3YlRQeDd5Z3ZqWEJ0Q1l5SzVjRHV5VHFxCjhRMFlUWlBOVU9SVWdGUXBrQ0ExWHBwY01ycWFvQ0lsd1lwUElWQ1JGeEg2eEd5QUNFVDFmcWhJSlhKUWt2UEgKWE1ZYUJzMWlUT1pRcHJ4VXR4d2VwRHpDbEpySDBoOFRpTVgrTm1lQjRndXoxeTZiSStDUGJwRlZwbUFGWHRTdwpmemlWVjRJV2VrZEFucDRPSUhYWWg0ZW9ZZ1NTMUsxVnhoMHRPRW1Idjk0RzN0V1FiejlHTnl2aFZ4SXM3eTdLCmpEaEJtUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFNOU4yTExCQ2pGakZRcEpKUVRvcFFrVG9QaWVlQzc1K292WApKT3Z5aThNVlBpWCtRc0U3NmcyYlg4dXpobCtZbWIrRlhlZHpyUDE0M3ZqNjJUbzcwSXJkU0FhMFN4UHByOGd5CkRLZDBXUHd2ZFBZcStHbVlyNTMybU9lRTYrK09acmJnVkRtS2lZV1EvOHpiUEJWU2tBdHZjUnBxQi8zQ1ZWcVIKT2pDREYxWEJWSytxVDZJRXpSZDlwc0hoVDYxNG93SXpVZURaOXBBb0hTWHFCOG5ZWDNMcVRnOFVSazhnT1lKYwpNdmpJd3hRc1k1bm8rM25VMTh6eDdtUU0xcFNRQkZCdU13aWhtODYvRVA2bkljd0NVZlhLK2lEa1BQNGs1OXpuClYwL2hSa1dsVVUyZVByYlRPUjI4QTFFNVg0S0c1Z0VZMmZLb0t2V1p2ZFhTOTFtTmdpST0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcGdJQkFBS0NBUUVBeUxZRmNqVXhxeFFvTGQ4TEdPblBZM1VvQmI4cC9CSm5SYlIrM05yVU9YMGJqRHBKCnNGOU1qYmlpWWNXUWpZQ2JEWU9ZODUyb0hNKzdFeG5BL1BiRmRmWGpDdWQ1RGFWWmdiTGdkK1pxSEpBK0lFeFMKeERIN3FCTDdiVFB4N3lndmpYQnRDWXlLNWNEdXlUcXE4UTBZVFpQTlVPUlVnRlFwa0NBMVhwcGNNcnFhb0NJbAp3WXBQSVZDUkZ4SDZ4R3lBQ0VUMWZxaElKWEpRa3ZQSFhNWWFCczFpVE9aUXByeFV0eHdlcER6Q2xKckgwaDhUCmlNWCtObWVCNGd1ejF5NmJJK0NQYnBGVnBtQUZYdFN3ZnppVlY0SVdla2RBbnA0T0lIWFloNGVvWWdTUzFLMVYKeGgwdE9FbUh2OTRHM3RXUWJ6OUdOeXZoVnhJczd5N0tqRGhCbVFJREFRQUJBb0lCQVFDYzcwM2sxZGpuSnBTZwpBVlVnL3JoTTBPOGhSeTZoelJYNHQ3KzJHbGgwTnZGU1BNVWZaZlJxbjZKQUJvVVhUeVp0YzZjbFhQRjB6YXc5CnJCWnM5TnJDZUNjMWdIWHppSVVxMTEyU0FwU1hqdVUweGRpMVZVdXJTR1JWSjVlVTR2d0RnSk9STXRYci9XWDMKNjZwN1hqelJjNjdIQURGZVFmQlpwQVYyMmdVYkY4OUVyYUNxOEgyZlUwUU5veXRVOER0M3FKazVNUmRaanBYYgphVHBUbmZjNTdvUm9icTcvZ1hGVmQvUGc3UXgxcWlkYVI3ZytVeFNUQTNMOHNnK20wRnZvS1pSaUxiQ1M2V2IzCkJnNjR6NGxENzNhSENEbDhNYnBsbFJwbXU4cy93S01sc0gzNHZNNXFBbE1WdDk3WTQxRS84MTNNL20yQ1NvYzIKcGFPSjhsTE5Bb0dCQU5BTEl2QWlZZmp3RUJnY1RZK1FrcGpIdk5rcGkyN1JUWW1naVdVakdHZHNJaWtTVjdaWApKRVN4WkcyR0dXeXpPWUNTak9JVXdpM2Q5QiswRkVrYlpBd0tOZUVuMWFxWWtMM0VlWjA2RGErNVFVVHVUTUdqCnN2UnAvbnRxOSs4Z2lPOG1CbDJUb1I5ZDdxeGw3dTZ3cEQzc1pxNHVmQmNyVDg2clc3b09sUGtEQW9HQkFQYjYKTC95Y20rSEFTRU9lcnZqUUphaGRqVTZRK3hnMmJ4WndzR2Y4ZW50QmxIZEpjR2Z1cWNkTWdiU1p0R0c0elE3RwpDYXVUVFZBSVpkaEtKY2E0MEU0NDNqclFnY3NEbTc1Y2NBbjMrZUg2bDQycWxEdjcvSVNTUzAwQmcxNStpWW5JClNGSVp2ZEZ3aWtMMWhnVVdjbUNDRGJ4SlpDVlBrR0gzU05SZmt1SXpBb0dCQUpDWlhQUkpBWTJUMWF2Y2FEQkQKelJDeHExbkpIV2V0eEZYSEpoZ01sNWF5dXQrUEp6WE9SYUFWSi9kVUFISGo5RENnSzVtcjBmY3RVTk9FUjZFMApqNG9xd3A0M0lMUk5ERFZKelRseHN6ZVM3SUdybTkvdkZwLzQxKzhTUHplT2huNnFFRHlVTXFYcGxNMXduK3g1CkMvOGFRNWdIS1NxMWFPZjloR2pDWDlyZkFvR0JBTXcrQ0RNYWZCckwvYmJWNHBMbTUwMTkyQjdSN0tTUVYzdXkKUTJBclBrcng1OHBpRkRBUEFaNU1XYk0xclNOblJVVGpaeG5abmdVQ2ZON0tLc1ZWRHdheEpxNXl3Zk5XajVSMApNejg3TUEyK1ExaW5hU0RWK1hUVTJxcmJCbjI5blJZeGFBVmxQa0dXbFBCY3hMRXVaL1lCZDBSdldQODE5Z3ZlCkNQOS83aU5iQW9HQkFMVm16TVU1R3UxWmxXZDQ0aGVUZjRjNk5yS1Bsc3VkL25Gc3d6ajl0b1V4ZW14QVZRNUUKUlQyZThFMlpsaXRkTFRzOXhTTnBUc3BOZHg2TUNaK3FSNHdhN2UrUlJIbjZ2blQ1bXNJUGJFUHF3MUplMW4xaQpFQ3RnY0twdFlNcHcrUGJrQWVqRS9CaHRZcWtQbWNkdk5DVEtnelRFVDVkQzJnWFQxblV0WkFQcwotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/kubernetes-configs/voltha/flex-ocp-cord-ofagent-go.yml b/kubernetes-configs/voltha/flex-ocp-cord-ofagent-go.yml
new file mode 100644
index 0000000..73154c7
--- /dev/null
+++ b/kubernetes-configs/voltha/flex-ocp-cord-ofagent-go.yml
@@ -0,0 +1,53 @@
+# Copyright 2019 Ciena Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+defaults:
+  image_tag: master
+  image_pullPolicy: Always
+use_ofagent_go: true
+
+images:
+#  onos:
+#    repository: voltha/voltha-onos
+#    tag: onos-2.2
+#  adapter_open_onu:
+#    repository: gcgirish/voltha-openonu-adapter
+#    tag: dhcp-issue
+  ofagent:
+    repository: voltha/ofagent-go
+    tag: master
+
+deployments:
+  etcdOperator: true
+  backupOperator: false
+  restoreOperator: false
+
+voltha-etcd-cluster:
+  clusterSize: 1
+onos_env:
+- name: POD_IP
+  valueFrom:
+  fieldRef:
+    fieldPath: status.podIP
+- name: NAMESPACE
+  valueFrom:
+  fieldRef:
+    fieldPath: metadata.namespace
+- name: ONOS_APPS
+  value: "drivers,openflow-base,hostprovider"
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/onf-demo-pod-ofagent-go.yml b/kubernetes-configs/voltha/onf-demo-pod-ofagent-go.yml
new file mode 100644
index 0000000..73154c7
--- /dev/null
+++ b/kubernetes-configs/voltha/onf-demo-pod-ofagent-go.yml
@@ -0,0 +1,53 @@
+# Copyright 2019 Ciena Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+defaults:
+  image_tag: master
+  image_pullPolicy: Always
+use_ofagent_go: true
+
+images:
+#  onos:
+#    repository: voltha/voltha-onos
+#    tag: onos-2.2
+#  adapter_open_onu:
+#    repository: gcgirish/voltha-openonu-adapter
+#    tag: dhcp-issue
+  ofagent:
+    repository: voltha/ofagent-go
+    tag: master
+
+deployments:
+  etcdOperator: true
+  backupOperator: false
+  restoreOperator: false
+
+voltha-etcd-cluster:
+  clusterSize: 1
+onos_env:
+- name: POD_IP
+  valueFrom:
+  fieldRef:
+    fieldPath: status.podIP
+- name: NAMESPACE
+  valueFrom:
+  fieldRef:
+    fieldPath: metadata.namespace
+- name: ONOS_APPS
+  value: "drivers,openflow-base,hostprovider"
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1