diff --git a/deployment-configs/aether/apps/azure/cassandra.yaml b/deployment-configs/aether/apps/azure/cassandra.yaml
deleted file mode 100644
index 9258e77..0000000
--- a/deployment-configs/aether/apps/azure/cassandra.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-fullnameOverride: "cassandra"
-image:
-  tag: "2.1.20"
-persistence:
-  enabled: true
-  storageClass: "hostpath"
-config:
-  cluster_size: 1
-  seed_size: 1
-  cluster_domain: "azure.central"
-  endpoint_snitch: "GossipingPropertyFileSnitch"
diff --git a/deployment-configs/aether/apps/azure/omec-cp-b7.yaml b/deployment-configs/aether/apps/azure/omec-cp-b7.yaml
deleted file mode 100644
index 79400de..0000000
--- a/deployment-configs/aether/apps/azure/omec-cp-b7.yaml
+++ /dev/null
@@ -1,171 +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.7.1"
-    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
-    spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.3"
-  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]
-        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-b7
-        MCC = 315
-        MNC = 010
-        TAC = 17
-        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-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"
-    bootstrap:
-      enabled: true
-      users:
-        - 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: "315010999912349"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "732111000000420"
-          msisdn: "1122334455"
-          apn: internet
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "732111000000421"
-          msisdn: "1122334455"
-          apn: internet
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912350"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-        - imsi: "315010999912351"
-          msisdn: "1122334455"
-          apn: "internet"
-          key: "000102030405060708090a0b0c0d0e0f"
-          opc: "69d5c2eb2e2e624750541d3bbc692ba5"
-          sqn: 135
-      mmes:
-        - id: 1
-          isdn: "19136246000"
-          unreachability: 1
diff --git a/deployment-configs/aether/apps/edge-template/nem-monitoring.yaml b/deployment-configs/aether/apps/edge-template/nem-monitoring.yaml
deleted file mode 100644
index 7541e91..0000000
--- a/deployment-configs/aether/apps/edge-template/nem-monitoring.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-kpi_exporter:
-  enabled: false
-
-prometheus:
-  alertmanager:
-    enabled: false
-  kubeStateMetrics:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-kube-state-metrics"
-  nodeExporter:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-node-exporter"
-  pushgateway:
-    enabled: false
-  server:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-server"
-    # NOTE: set unique datacenter name for each clusters
-    global:
-      external_labels:
-        datacenter: #SET_VALUE
-
-grafana:
-  fullnameOverride: "nem-monitoring-grafana"
-
-dashboards:
-  k8s: false
-  nodeExporter: false
-  xos: false
-  onos: false
-  aaa: false
-  voltha: false
-  omec: false
-  aether: true
diff --git a/deployment-configs/aether/apps/edge-template/omec-dp-cni.yaml b/deployment-configs/aether/apps/edge-template/omec-dp-cni.yaml
deleted file mode 100644
index 824335a..0000000
--- a/deployment-configs/aether/apps/edge-template/omec-dp-cni.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-  sriov:
-    resourceList:
-      vfio:
-        s1uPfNames:
-          - #SET_VALUE#0-3
-        sgiPfNames:
-          - #SET_VALUE#4-7
diff --git a/deployment-configs/aether/apps/edge-template/omec-dp.yaml b/deployment-configs/aether/apps/edge-template/omec-dp.yaml
deleted file mode 100644
index df6cddd..0000000
--- a/deployment-configs/aether/apps/edge-template/omec-dp.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:#SET_VALUE"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: #SET_VALUE
-  spgwu:
-    label: omec-dp
-    value: enabled
-
-config:
-  spgwu:
-    multiUpfs: true
-    cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
-    s1u:
-      device: "s1u-net"
-      ip: #SET_VALUE
-    sgi:
-      device: "sgi-net"
-      ip: #SET_VALUE
-    dpName: #SET_VALUE
-networks:
-  sgi:
-    gateway: #SET_VALUE
diff --git a/deployment-configs/aether/apps/edge-template/omec-upf.yaml b/deployment-configs/aether/apps/edge-template/omec-upf.yaml
deleted file mode 100644
index 3429493..0000000
--- a/deployment-configs/aether/apps/edge-template/omec-upf.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-images:
-  tags:
-    bess: "registry.central.aetherproject.net/upf-epc-bess:#SET_VALUE"
-    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:#SET_VALUE"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: #SET_VALUE
-  spgwu:
-    label: omec-upf
-    value: enabled
-
-config:
-  spgwu:
-    name: #SET_VALUE
-    s1u:
-      device: "s1u"
-      ip: #SET_VALUE
-    sgi:
-      device: "sgi"
-      ip: #SET_VALUE
-    zmq:
-      spgwc:
-        addr: "spgwc-headless.omec.svc.product.central"
-
-networks:
-  enb:
-    subnet: #SET_VALUE
-  ue:
-    subnet: #SET_VALUE
-  sgi:
-    subnet: #SET_VALUE
-    gateway: #SET_VALUE
-  s1u:
-    subnet: #SET_VALUE
-    gateway: #SET_VALUE
diff --git a/deployment-configs/aether/apps/gcp-prd/cassandra.yaml b/deployment-configs/aether/apps/gcp-prd/cassandra.yaml
deleted file mode 100644
index b64461a..0000000
--- a/deployment-configs/aether/apps/gcp-prd/cassandra.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-fullnameOverride: "cassandra"
-image:
-  tag: "2.1.20"
-persistence:
-  enabled: true
-  storageClass: "zonal-ssd"
-config:
-  cluster_domain: "product.central"
-  endpoint_snitch: "GossipingPropertyFileSnitch"
diff --git a/deployment-configs/aether/apps/gcp-prd/mcord-services.yaml b/deployment-configs/aether/apps/gcp-prd/mcord-services.yaml
deleted file mode 100644
index 6771c9b..0000000
--- a/deployment-configs/aether/apps/gcp-prd/mcord-services.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-progran:
-  enabled: false
-
-mcord-subscriber:
-  image:
-    repository: "omecproject/mcord-synchronizer"
-    tag: "comac-1.0.0"
-    pullPolicy: "IfNotPresent"
-
-fabric:
-  enabled: true
-
-onosFabricRestHost: "onos-ui.onos.svc.menlo.edge"
-onosFabricRestPort: 8181
diff --git a/deployment-configs/aether/apps/gcp-prd/nem-monitoring.yaml b/deployment-configs/aether/apps/gcp-prd/nem-monitoring.yaml
deleted file mode 100644
index 7291171..0000000
--- a/deployment-configs/aether/apps/gcp-prd/nem-monitoring.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-kpi_exporter:
-  enabled: false
-
-prometheus:
-  alertmanager:
-    enabled: false
-  kubeStateMetrics:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-kube-state-metrics"
-  nodeExporter:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-node-exporter"
-  pushgateway:
-    enabled: false
-  server:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-server"
-    # NOTE: set unique datacenter name for each clusters
-    global:
-      external_labels:
-        datacenter: "central-gcp"
-
-grafana:
-  fullnameOverride: "nem-monitoring-grafana"
-
-dashboards:
-  k8s: false
-  nodeExporter: false
-  xos: false
-  onos: false
-  aaa: false
-  voltha: false
-  omec: false
-  aether: true
diff --git a/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml b/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
deleted file mode 100644
index 111af4f..0000000
--- a/deployment-configs/aether/apps/gcp-prd/omec-cp.yaml
+++ /dev/null
@@ -1,167 +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.7.3"
-    mmeExporter: "registry.central.aetherproject.net/mme-exporter:0.3.1"
-    spgwc: "registry.central.aetherproject.net/ngic-cp:1.1.6"
-  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 = 5
-        IPV4_MTU = 1450
-        [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 = 203
-        DNS_PRIMARY = 1.1.1.1
-        DNS_SECONDARY = 8.8.8.8
-        [DP_SELECTION_RULE_4]
-        DPID = 4
-        DPNAME = dp-tucson
-        MCC = 315
-        MNC = 010
-        TAC = 222
-        DNS_PRIMARY = 1.1.1.1
-        DNS_SECONDARY = 8.8.8.8
-        [DP_SELECTION_RULE_5]
-        DPID = 5
-        DPNAME = dp-ntt
-        MCC = 999
-        MNC = 002
-        TAC = 1
-        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
-          plmnlist:
-            plmn1: "mcc=315,mnc=010"
-            plmn2: "mcc=999,mnc=002"
-      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
-        - id: onf-tucson
-          tac: 222
-          edgeName: edge-onf-tucson
-        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"
-        - imsi: 315010999912301
-          phoneType: "iPhone 11"
-        - imsi: 315010999912302
-          phoneType: "iPhone 11"
-        - imsi: 315010999912303
-          phoneType: "iPhone 11"
-  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
-        - imsiStart: "315010999912301"
-          msisdnStart: "9999234455"
-          count: 30
-      mmes:
-        - id: 1
-          isdn: "19136246000"
-          unreachability: 1
diff --git a/deployment-configs/aether/apps/gcp-stg/cassandra.yaml b/deployment-configs/aether/apps/gcp-stg/cassandra.yaml
deleted file mode 100644
index 00fbdde..0000000
--- a/deployment-configs/aether/apps/gcp-stg/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/gcp-stg/omec-cp.yaml b/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml
deleted file mode 100644
index 30de3c0..0000000
--- a/deployment-configs/aether/apps/gcp-stg/omec-cp.yaml
+++ /dev/null
@@ -1,143 +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.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/global/cdn-remote.yaml b/deployment-configs/aether/apps/global/cdn-remote.yaml
deleted file mode 100644
index 0f9e961..0000000
--- a/deployment-configs/aether/apps/global/cdn-remote.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-  clusterDomain: "global"
-  videoArchive:
-    q360p:
-      enabled: false
-    q480p:
-      enabled: true
-    q720p:
-      enabled: false
diff --git a/deployment-configs/aether/apps/global/global-docker-registry.yaml b/deployment-configs/aether/apps/global/global-docker-registry.yaml
deleted file mode 100644
index f7c4b1e..0000000
--- a/deployment-configs/aether/apps/global/global-docker-registry.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-secrets:
-  htpasswd: ""
-persistence:
-  enabled: false
-ingress:
-  enabled: true
-  hosts:
-    - "registry.central.aetherproject.net"
-  annotations:
-     "nginx.ingress.kubernetes.io/proxy-body-size": "0"
diff --git a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml b/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
deleted file mode 100644
index e92cb61..0000000
--- a/deployment-configs/aether/apps/global/global-nem-monitoring.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-kpi_exporter:
-  enabled: false
-
-prometheus:
-  alertmanager:
-    enabled: false
-  kubeStateMetrics:
-    enabled: false
-  nodeExporter:
-    enabled: false
-  pushgateway:
-    enabled: false
-  server:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-server"
-    extraArgs:
-      web.route-prefix: "/prometheus"
-      web.external-url: "https://aether.onlab.us/prometheus"
-    prefixURL: "/prometheus"
-    ingress:
-      enabled: true
-      hosts:
-        - aether.onlab.us/prometheus
-  serverFiles:
-    prometheus.yml:
-      scrape_configs:
-        - job_name: prometheus-aggregator
-          scrape_interval: 15s
-          honor_labels: true
-          metrics_path: /federate
-          params:
-            match[]:
-              - '{job="kubernetes-nodes-cadvisor"}'
-              - '{job="kubernetes-service-endpoints"}'
-          static_configs:
-            - targets:
-              - nem-monitoring-prometheus-server.nem-monitoring-p-74nmx.svc.product.central:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-whlwm.svc.azure.central:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-9ljjp.svc.menlo.edge:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-7jkzz.svc.intel.edge:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-h27t2.svc.tucson.edge:80
-              - nem-monitoring-prometheus-server.nem-monitoring-p-5lgn2.svc.ntt.edge:80
-        - job_name: 'mme-exporter-production'
-          metrics_path: /metrics
-          scrape_interval: 15s
-          static_configs:
-            - targets:
-                - mme.omec.svc.product.central:3081
-        - job_name: 'mme-exporter-azure'
-          metrics_path: /metrics
-          scrape_interval: 15s
-          static_configs:
-            - targets:
-                - mme.omec.svc.azure.central:3081
-  extraScrapeConfigs: ""
-
-grafana:
-  fullnameOverride: "nem-monitoring-grafana"
-  ingress:
-    enabled: true
-    hosts:
-      - aether.onlab.us
-    path: "/grafana"
-  grafana.ini:
-    server:
-      domain: aether.onlab.us
-      root_url: https://aether.onlab.us/grafana
-      serve_from_sub_path: true
-    paths:
-      data: /var/lib/grafana/data
-      logs: /var/log/grafana
-      plugins: /var/lib/grafana/plugins
-      provisioning: /etc/grafana/provisioning
-    analytics:
-      check_for_updates: true
-    log:
-      mode: console
-    grafana_net:
-      url: https://grafana.net
-  datasources:
-    datasources.yaml:
-      apiVersion: 1
-      datasources:
-        - name: Prometheus
-          type: prometheus
-          url: http://nem-monitoring-prometheus-server/prometheus
-          access: proxy
-          isDefault: true
-
-dashboards:
-  k8s: false
-  nodeExporter: false
-  xos: true
-  onos: false
-  aaa: false
-  voltha: false
-  omec: false
-  aether: true
diff --git a/deployment-configs/aether/apps/intel/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/intel/accelleran-cbrs-common.yaml
deleted file mode 100644
index 77ac130..0000000
--- a/deployment-configs/aether/apps/intel/accelleran-cbrs-common.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    nats: registry.central.aetherproject.net/aether/accelleran-cu-nats:v1.0.0
-    redis: registry.central.aetherproject.net/aether/accelleran-cu-redis:v1.0.0
-    redisClient: registry.central.aetherproject.net/aether/redis:5.0.6-alpine3.10
-    ric: registry.central.aetherproject.net/aether/accelleran-cu-ric:v1.0.0
-    ricWeb: registry.central.aetherproject.net/aether/accelleran-cu-ricweb:v1.0.0
-    depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
-  pullPolicy: IfNotPresent
-
-config:
-  nats:
-    ip: "10.212.74.65"
diff --git a/deployment-configs/aether/apps/intel/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/intel/accelleran-cbrs-cu.yaml
deleted file mode 100644
index bece439..0000000
--- a/deployment-configs/aether/apps/intel/accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-tdd:v1.0.2
-    depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
-  pullPolicy: IfNotPresent
-
-config:
-  mme:
-    ip: "10.168.0.204"
-  vranL3:
-    plmnId: "130501"
-    instanceId: "intelcell101"
-    tac: 101
-    enbId: 1
diff --git a/deployment-configs/aether/apps/intel/nem-monitoring.yaml b/deployment-configs/aether/apps/intel/nem-monitoring.yaml
deleted file mode 100644
index 46dc58a..0000000
--- a/deployment-configs/aether/apps/intel/nem-monitoring.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-kpi_exporter:
-  enabled: false
-
-prometheus:
-  alertmanager:
-    enabled: false
-  kubeStateMetrics:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-kube-state-metrics"
-  nodeExporter:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-node-exporter"
-  pushgateway:
-    enabled: false
-  server:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-server"
-    # NOTE: set unique datacenter name for each clusters
-    global:
-      external_labels:
-        datacenter: "edge-onf-menlo-staging"
-
-grafana:
-  fullnameOverride: "nem-monitoring-grafana"
-
-dashboards:
-  k8s: false
-  nodeExporter: false
-  xos: false
-  onos: false
-  aaa: false
-  voltha: false
-  omec: false
-  aether: true
diff --git a/deployment-configs/aether/apps/intel/omec-dp-cni.yaml b/deployment-configs/aether/apps/intel/omec-dp-cni.yaml
deleted file mode 100644
index 9e0ca61..0000000
--- a/deployment-configs/aether/apps/intel/omec-dp-cni.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-  sriov:
-    resourceList:
-      vfio:
-        s1uPfNames:
-          - data#0-3
-        sgiPfNames:
-          - data#4-7
diff --git a/deployment-configs/aether/apps/intel/omec-dp-ngic.yaml b/deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
deleted file mode 100644
index 0ee2f97..0000000
--- a/deployment-configs/aether/apps/intel/omec-dp-ngic.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.0"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: true
-  spgwu:
-    label: omec-dp
-    value: enabled
-
-config:
-  spgwu:
-    multiUpfs: true
-    cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
-    s1u:
-      device: "s1u-net"
-      # NOTE: set different IP for each edge
-      ip: "10.212.74.67/28"
-    sgi:
-      device: "sgi-net"
-      # NOTE: set different IP for each edge
-      ip: "10.212.74.97/27"
-    dpName: "dp-intel"
-networks:
-  sgi:
-    # NOTE: set correct gateway for each edge
-    mask: "255.255.255.224"
-    gateway: "10.212.74.126"
diff --git a/deployment-configs/aether/apps/intel/omec-upf.yaml b/deployment-configs/aether/apps/intel/omec-upf.yaml
deleted file mode 100644
index 448f0b4..0000000
--- a/deployment-configs/aether/apps/intel/omec-upf.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-images:
-  tags:
-    bess: "registry.central.aetherproject.net/upf-epc-bess:intel-native"
-    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:intel-native"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: true
-  spgwu:
-    label: omec-upf
-    value: enabled
-
-config:
-  spgwu:
-    name: "dp-intel"
-    s1u:
-      device: "s1u"
-      ip: "10.212.74.81/28"
-    sgi:
-      device: "sgi"
-      ip: "10.212.74.97/27"
-    zmq:
-      spgwc:
-        addr: "spgwc-headless.omec.svc.product.central"
-
-networks:
-  enb:
-    subnet: "10.212.74.64/28"
-  ue:
-    subnet: "10.250.0.0/16"
-  sgi:
-    subnet: "10.212.74.96/27"
-    gateway: "10.212.74.126"
-  s1u:
-    subnet: "10.212.74.80/28"
-    gateway: "10.212.74.94"
diff --git a/deployment-configs/aether/apps/menlo-demo/accelleran-b7-cu.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-b7-cu.yaml
deleted file mode 100644
index 38bde54..0000000
--- a/deployment-configs/aether/apps/menlo-demo/accelleran-b7-cu.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    nats: registry.central.aetherproject.net/aether/accelleran-cu-nats-b17:v1.0.0
-    redis: registry.central.aetherproject.net/aether/accelleran-cu-redis-b17:v1.0.0
-    vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-fdd-b17:v1.0.0
-  pullPolicy: IfNotPresent
-
-nodeSelectors:
-  enabled: true
-  accelleranCU:
-    label: omec-dp-b7
-    value: enabled
-
-config:
-  epc:
-    plmnId: 130501
-  nats:
-    ip: 10.93.1.20
-  mme:
-    ip: 172.16.0.8
-  progran:
-    enabled: false
diff --git a/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-common.yaml
deleted file mode 100644
index 018ef28..0000000
--- a/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-common.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    nats: registry.central.aetherproject.net/aether/accelleran-cu-nats:v1.0.0
-    redis: registry.central.aetherproject.net/aether/accelleran-cu-redis:v1.0.0
-    redisClient: registry.central.aetherproject.net/aether/redis:5.0.6-alpine3.10
-    ric: registry.central.aetherproject.net/aether/accelleran-cu-ric:v1.0.0
-    ricWeb: registry.central.aetherproject.net/aether/accelleran-cu-ricweb:v1.0.0
-    depCheck: registry.central.aetherproject.net/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/menlo-demo/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
deleted file mode 100644
index 03cbd9b..0000000
--- a/deployment-configs/aether/apps/menlo-demo/accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-tdd:v1.0.2
-    depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
-  pullPolicy: IfNotPresent
-
-nodeSelectors:
-  enabled: true
-  accelleranCBRSCU:
-    label: omec-dp-cbrs
-    value: enabled
-
-config:
-  mme:
-    ip: "10.168.0.204"
-  vranL3:
-    plmnId: "130501"
-    instanceId: "onfcell203"
-    tac: 203
-    enbId: 2
-    ports:
-      s1ap:
-        nodePort: 31412
diff --git a/deployment-configs/aether/apps/menlo-demo/cdn-local.yaml b/deployment-configs/aether/apps/menlo-demo/cdn-local.yaml
deleted file mode 100644
index bc29386..0000000
--- a/deployment-configs/aether/apps/menlo-demo/cdn-local.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: 1450
-  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/menlo-demo/nem-monitoring.yaml b/deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
deleted file mode 100644
index 8e23ee9..0000000
--- a/deployment-configs/aether/apps/menlo-demo/nem-monitoring.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-kpi_exporter:
-  enabled: false
-
-prometheus:
-  alertmanager:
-    enabled: false
-  kubeStateMetrics:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-kube-state-metrics"
-  nodeExporter:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-node-exporter"
-  pushgateway:
-    enabled: false
-  server:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-server"
-    # NOTE: set unique datacenter name for each clusters
-    global:
-      external_labels:
-        datacenter: "edge-onf-menlo-demo"
-
-grafana:
-  fullnameOverride: "nem-monitoring-grafana"
-
-dashboards:
-  k8s: false
-  nodeExporter: false
-  xos: false
-  onos: false
-  aaa: false
-  voltha: false
-  omec: false
-  aether: true
diff --git a/deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
deleted file mode 100644
index 88b0510..0000000
--- a/deployment-configs/aether/apps/menlo-demo/omec-dp-b7.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.0"
-  pullPolicy: "IfNotPresent"
-
-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: "dp-b7"
-networks:
-  sgi:
-    # NOTE: set correct gateway for each edge
-    gateway: "192.168.250.254"
diff --git a/deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
deleted file mode 100644
index 06d04f8..0000000
--- a/deployment-configs/aether/apps/menlo-demo/omec-dp-cbrs.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.0"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: true
-  spgwu:
-    label: omec-dp-cbrs
-    value: enabled
-
-config:
-  spgwu:
-    multiUpfs: true
-    cpComm:
-      addr: "spgwc-headless.omec.svc.product.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-demo"
-networks:
-  sgi:
-    # NOTE: set correct gateway for each edge
-    gateway: "192.168.250.254"
diff --git a/deployment-configs/aether/apps/menlo-demo/omec-dp-cni.yaml b/deployment-configs/aether/apps/menlo-demo/omec-dp-cni.yaml
deleted file mode 100644
index 8e8a621..0000000
--- a/deployment-configs/aether/apps/menlo-demo/omec-dp-cni.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-  sriov:
-    resourceList:
-      vfio:
-        s1uPfNames:
-          - eth2#0-3
-        sgiPfNames:
-          - eth2#4-7
diff --git a/deployment-configs/aether/apps/menlo-demo/omec-upf.yaml b/deployment-configs/aether/apps/menlo-demo/omec-upf.yaml
deleted file mode 100644
index 38a21c4..0000000
--- a/deployment-configs/aether/apps/menlo-demo/omec-upf.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-images:
-  tags:
-    bess: "registry.central.aetherproject.net/upf-epc-bess:0.1.0-dev"
-    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:0.1.0-dev"
-  pullPolicy: "IfNotPresent"
-nodeSelectors:
-  enabled: true
-config:
-  spgwu:
-    name: "dp-demo"
-    s1u:
-      device: "s1u"
-      ip: "192.168.252.3/24"
-    sgi:
-      device: "sgi"
-      ip: "192.168.250.3/24"
-    zmq:
-      spgwc:
-        addr: "spgwc-headless.omec.svc.product.central"
-networks:
-  enb:
-    subnet: "192.168.251.0/24"
-  ue:
-    subnet: "10.250.0.0/16"
-  sgi:
-    subnet: "192.168.250.0/24"
-    gateway: "192.168.250.254"
-  s1u:
-    subnet: "192.168.252.0/24"
-    gateway: "192.168.252.254"
diff --git a/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml
deleted file mode 100644
index e779924..0000000
--- a/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-common.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    nats: registry.central.aetherproject.net/aether/accelleran-cu-nats:v1.0.0
-    redis: registry.central.aetherproject.net/aether/accelleran-cu-redis:v1.0.0
-    redisClient: registry.central.aetherproject.net/aether/redis:5.0.6-alpine3.10
-    ric: registry.central.aetherproject.net/aether/accelleran-cu-ric:v1.0.0
-    ricWeb: registry.central.aetherproject.net/aether/accelleran-cu-ricweb:v1.0.0
-    depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
-  pullPolicy: IfNotPresent
-
-nodeSelectors:
-  enabled: true
-  accelleranCBRSCommon:
-    label: accelleran
-    value: enabled
-
-config:
-  nats:
-    ip: "10.92.1.30"
diff --git a/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu-b42.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu-b42.yaml
deleted file mode 100644
index 8946dca..0000000
--- a/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu-b42.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-config:
-  mwc: true
-  mme:
-    ip: "10.168.0.204"
-  vranL3:
-    plmnId: "130501"
-    instanceId: "onfcell221"
-    freqBand: 42
-    earfcnDl: 42590
-    earfcnUl: 42590
-    tac: 221
diff --git a/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
deleted file mode 100644
index dc93f4a..0000000
--- a/deployment-configs/aether/apps/menlo-stg/accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-tdd:v1.0.2
-    depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
-  pullPolicy: IfNotPresent
-
-nodeSelectors:
-  enabled: true
-  accelleranCBRSCU:
-    label: accelleran
-    value: enabled
-
-config:
-  mme:
-    ip: "10.168.0.194"
-  vranL3:
-    plmnId: "130501"
-    instanceId: "onfcell202"
-    tac: 202
diff --git a/deployment-configs/aether/apps/menlo-stg/cdn-local.yaml b/deployment-configs/aether/apps/menlo-stg/cdn-local.yaml
deleted file mode 100644
index df762b3..0000000
--- a/deployment-configs/aether/apps/menlo-stg/cdn-local.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: 1450
-  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.1
diff --git a/deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml b/deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
deleted file mode 100644
index 46dc58a..0000000
--- a/deployment-configs/aether/apps/menlo-stg/nem-monitoring.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-kpi_exporter:
-  enabled: false
-
-prometheus:
-  alertmanager:
-    enabled: false
-  kubeStateMetrics:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-kube-state-metrics"
-  nodeExporter:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-node-exporter"
-  pushgateway:
-    enabled: false
-  server:
-    enabled: true
-    fullnameOverride: "nem-monitoring-prometheus-server"
-    # NOTE: set unique datacenter name for each clusters
-    global:
-      external_labels:
-        datacenter: "edge-onf-menlo-staging"
-
-grafana:
-  fullnameOverride: "nem-monitoring-grafana"
-
-dashboards:
-  k8s: false
-  nodeExporter: false
-  xos: false
-  onos: false
-  aaa: false
-  voltha: false
-  omec: false
-  aether: true
diff --git a/deployment-configs/aether/apps/menlo-stg/omec-dp-cni.yaml b/deployment-configs/aether/apps/menlo-stg/omec-dp-cni.yaml
deleted file mode 100644
index 8e8a621..0000000
--- a/deployment-configs/aether/apps/menlo-stg/omec-dp-cni.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-  sriov:
-    resourceList:
-      vfio:
-        s1uPfNames:
-          - eth2#0-3
-        sgiPfNames:
-          - eth2#4-7
diff --git a/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml b/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
deleted file mode 100644
index f069c0a..0000000
--- a/deployment-configs/aether/apps/menlo-stg/omec-dp.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:1.1.0"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: true
-  spgwu:
-    label: omec-dp
-    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.7/24"
-    sgi:
-      device: "sgi-net"
-      # NOTE: set different IP for each edge
-      ip: "192.168.250.7/24"
-    dpName: "dp-staging"
-networks:
-  sgi:
-    # NOTE: set correct gateway for each edge
-    gateway: "192.168.250.1"
diff --git a/deployment-configs/aether/apps/menlo-stg/omec-upf.yaml b/deployment-configs/aether/apps/menlo-stg/omec-upf.yaml
deleted file mode 100644
index 19ec3a7..0000000
--- a/deployment-configs/aether/apps/menlo-stg/omec-upf.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-images:
-  tags:
-    bess: "registry.central.aetherproject.net/upf-epc-bess:0.1.0-dev"
-    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:0.1.0-dev"
-  pullPolicy: "IfNotPresent"
-nodeSelectors:
-  enabled: true
-config:
-  spgwu:
-    name: "dp-staging"
-    s1u:
-      device: "s1u"
-      ip: "192.168.252.7/24"
-    sgi:
-      device: "sgi"
-      ip: "192.168.250.7/24"
-    zmq:
-      spgwc:
-        addr: "spgwc-headless.omec.svc.product.central"
-networks:
-  enb:
-    subnet: "192.168.251.0/24"
-  ue:
-    subnet: "10.250.0.0/16"
-  sgi:
-    subnet: "192.168.250.0/24"
-    gateway: "192.168.250.1"
-  s1u:
-    subnet: "192.168.252.0/24"
-    gateway: "192.168.252.1"
diff --git a/deployment-configs/aether/apps/ntt/omec-dp-cni.yaml b/deployment-configs/aether/apps/ntt/omec-dp-cni.yaml
deleted file mode 100644
index 6f4a8ac..0000000
--- a/deployment-configs/aether/apps/ntt/omec-dp-cni.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-  sriov:
-    resourceList:
-      vfio:
-        s1uPfNames:
-          - ens5f0#0-3
-        sgiPfNames:
-          - ens5f0#4-7
diff --git a/deployment-configs/aether/apps/ntt/omec-dp.yaml b/deployment-configs/aether/apps/ntt/omec-dp.yaml
deleted file mode 100644
index f02935f..0000000
--- a/deployment-configs/aether/apps/ntt/omec-dp.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:ntt-native-debug"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: false
-
-config:
-  spgwu:
-    multiUpfs: true
-    cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
-    s1u:
-      device: "s1u-net"
-      ip: "10.155.10.254/24"
-    sgi:
-      device: "sgi-net"
-      ip: "10.155.0.254/24"
-    dpName: "dp-ntt"
-networks:
-  sgi:
-    gateway: "10.155.0.1"
diff --git a/deployment-configs/aether/apps/ntt/omec-upf.yaml b/deployment-configs/aether/apps/ntt/omec-upf.yaml
deleted file mode 100644
index 18460b4..0000000
--- a/deployment-configs/aether/apps/ntt/omec-upf.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-images:
-  tags:
-    bess: "registry.central.aetherproject.net/upf-epc-bess:ntt-native"
-    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:ntt-native"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: false
-
-config:
-  spgwu:
-    name: "dp-ntt"
-    s1u:
-      device: "s1u"
-      ip: "10.155.10.254/24"
-    sgi:
-      device: "sgi"
-      ip: "10.155.0.254/24"
-    zmq:
-      spgwc:
-        addr: "spgwc-headless.omec.svc.product.central"
-
-networks:
-  enb:
-    subnet: "10.0.0.0/24"
-  ue:
-    subnet: "10.250.0.0/16"
-  sgi:
-    subnet: "10.155.0.0/24"
-    gateway: "10.155.0.1"
-  s1u:
-    subnet: "10.155.10.0/24"
-    gateway: "10.155.10.1"
diff --git a/deployment-configs/aether/apps/tucson/accelleran-cbrs-common.yaml b/deployment-configs/aether/apps/tucson/accelleran-cbrs-common.yaml
deleted file mode 100644
index 0e3cd2d..0000000
--- a/deployment-configs/aether/apps/tucson/accelleran-cbrs-common.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    nats: registry.central.aetherproject.net/aether/accelleran-cu-nats:v1.0.0
-    redis: registry.central.aetherproject.net/aether/accelleran-cu-redis:v1.0.0
-    redisClient: registry.central.aetherproject.net/aether/redis:5.0.6-alpine3.10
-    ric: registry.central.aetherproject.net/aether/accelleran-cu-ric:v1.0.0
-    ricWeb: registry.central.aetherproject.net/aether/accelleran-cu-ricweb:v1.0.0
-    depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
-  pullPolicy: IfNotPresent
-
-config:
-  nats:
-    ip: "10.76.28.13"
\ No newline at end of file
diff --git a/deployment-configs/aether/apps/tucson/accelleran-cbrs-cu.yaml b/deployment-configs/aether/apps/tucson/accelleran-cbrs-cu.yaml
deleted file mode 100644
index 25db131..0000000
--- a/deployment-configs/aether/apps/tucson/accelleran-cbrs-cu.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-images:
-  tags:
-    initCU: registry.central.aetherproject.net/aether/pod-init:1.0.0
-    vranL3: registry.central.aetherproject.net/aether/accelleran-cu-l3-tdd:v1.0.2
-    depCheck: registry.central.aetherproject.net/aether/kubernetes-entrypoint:v0.3.1
-  pullPolicy: IfNotPresent
-
-config:
-  mme:
-    ip: "35.235.67.169"
-  vranL3:
-    plmnId: "130501"
-    instanceId: "onfcell222"
-    tac: 222
-    enbId: 3
diff --git a/deployment-configs/aether/apps/tucson/omec-dp-cni.yaml b/deployment-configs/aether/apps/tucson/omec-dp-cni.yaml
deleted file mode 100644
index af89acb..0000000
--- a/deployment-configs/aether/apps/tucson/omec-dp-cni.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-  sriov:
-    resourceList:
-      vfio:
-        s1uPfNames:
-          - enp216s0f3#0-3
-        sgiPfNames:
-          - enp216s0f3#4-7
\ No newline at end of file
diff --git a/deployment-configs/aether/apps/tucson/omec-dp.yaml b/deployment-configs/aether/apps/tucson/omec-dp.yaml
deleted file mode 100644
index 67ac77f..0000000
--- a/deployment-configs/aether/apps/tucson/omec-dp.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-images:
-  tags:
-    spgwu: "registry.central.aetherproject.net/ngic-dp:tucson-native-debug"
-  pullPolicy: "IfNotPresent"
-
-nodeSelectors:
-  enabled: true
-  spgwu:
-    label: omec-dp
-    value: enabled
-
-config:
-  spgwu:
-    multiUpfs: true
-    cpComm:
-      addr: "spgwc-headless.omec.svc.product.central"
-    s1u:
-      device: "s1u-net"
-      # NOTE: set different IP for each edge
-      ip: "192.168.251.12/24"
-    sgi:
-      device: "sgi-net"
-      # NOTE: set different IP for each edge
-      ip: "192.168.250.12/24"
-    dpName: "dp-tucson"
-networks:
-  sgi:
-    # NOTE: set correct gateway for each edge
-    gateway: "192.168.250.1"
diff --git a/deployment-configs/aether/apps/tucson/omec-upf.yaml b/deployment-configs/aether/apps/tucson/omec-upf.yaml
deleted file mode 100644
index 13e7096..0000000
--- a/deployment-configs/aether/apps/tucson/omec-upf.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-images:
-  tags:
-    bess: "registry.central.aetherproject.net/upf-epc-bess:0.1.0-tucson"
-    cpiface: "registry.central.aetherproject.net/upf-epc-cpiface:0.1.0-tucson"
-  pullPolicy: "IfNotPresent"
-nodeSelectors:
-  enabled: false
-config:
-  spgwu:
-    name: "dp-tucson"
-    s1u:
-      device: "s1u"
-      ip: "192.168.252.12/24"
-    sgi:
-      device: "sgi"
-      ip: "192.168.250.12/24"
-    zmq:
-      spgwc:
-        addr: "spgwc-headless.omec.svc.product.central"
-networks:
-  enb:
-    subnet: "192.168.251.0/24"
-  ue:
-    subnet: "10.250.0.0/16"
-  sgi:
-    subnet: "192.168.250.0/24"
-    gateway: "192.168.250.1"
-  s1u:
-    subnet: "192.168.252.0/24"
-    gateway: "192.168.252.1"
\ No newline at end of file
diff --git a/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml b/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
deleted file mode 100644
index 5551520..0000000
--- a/deployment-configs/aether/clusters/multus-daemonset-pre-1.16.yml
+++ /dev/null
@@ -1,230 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  name: network-attachment-definitions.k8s.cni.cncf.io
-spec:
-  group: k8s.cni.cncf.io
-  version: v1
-  scope: Namespaced
-  names:
-    plural: network-attachment-definitions
-    singular: network-attachment-definition
-    kind: NetworkAttachmentDefinition
-    shortNames:
-    - net-attach-def
-  validation:
-    openAPIV3Schema:
-      properties:
-        spec:
-          properties:
-            config:
-                 type: string
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  name: multus
-rules:
-  - apiGroups: ["k8s.cni.cncf.io"]
-    resources:
-      - '*'
-    verbs:
-      - '*'
-  - apiGroups:
-      - ""
-    resources:
-      - pods
-      - pods/status
-    verbs:
-      - get
-      - update
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
-metadata:
-  name: multus
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: multus
-subjects:
-- kind: ServiceAccount
-  name: multus
-  namespace: kube-system
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: multus
-  namespace: kube-system
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: multus-cni-config
-  namespace: kube-system
-  labels:
-    tier: node
-    app: multus
-data:
-  # NOTE: If you'd prefer to manually apply a configuration file, you may create one here.
-  # In the case you'd like to customize the Multus installation, you should change the arguments to the Multus pod
-  # change the "args" line below from
-  # - "--multus-conf-file=auto"
-  # to:
-  # "--multus-conf-file=/tmp/multus-conf/70-multus.conf"
-  # Additionally -- you should ensure that the name "70-multus.conf" is the alphabetically first name in the
-  # /etc/cni/net.d/ directory on each node, otherwise, it will not be used by the Kubelet.
-  cni-conf.json: |
-    {
-      "name": "multus-cni-network",
-      "type": "multus",
-      "capabilities": {
-        "portMappings": true
-      },
-      "delegates": [
-        {
-          "cniVersion": "0.3.1",
-          "name": "default-cni-network",
-          "plugins": [
-            {
-              "type": "flannel",
-              "name": "flannel.1",
-                "delegate": {
-                  "isDefaultGateway": true,
-                  "hairpinMode": true
-                }
-              },
-              {
-                "type": "portmap",
-                "capabilities": {
-                  "portMappings": true
-                }
-              }
-          ]
-        }
-      ],
-      "kubeconfig": "/etc/cni/net.d/multus.d/multus.kubeconfig"
-    }
----
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: kube-multus-ds-amd64
-  namespace: kube-system
-  labels:
-    tier: node
-    app: multus
-spec:
-  updateStrategy:
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        tier: node
-        app: multus
-    spec:
-      hostNetwork: true
-      nodeSelector:
-        beta.kubernetes.io/arch: amd64
-      tolerations:
-      - operator: Exists
-        effect: NoSchedule
-      serviceAccountName: multus
-      containers:
-      - name: kube-multus
-        image: nfvpe/multus:v3.2
-        command: ["/entrypoint.sh"]
-        args:
-        - "--multus-conf-file=auto"
-        resources:
-          requests:
-            cpu: "100m"
-            memory: "50Mi"
-          limits:
-            cpu: "100m"
-            memory: "50Mi"
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: cni
-          mountPath: /host/etc/cni/net.d
-        - name: cnibin
-          mountPath: /host/opt/cni/bin
-        - name: multus-cfg
-          mountPath: /tmp/multus-conf
-      volumes:
-        - name: cni
-          hostPath:
-            path: /etc/cni/net.d
-        - name: cnibin
-          hostPath:
-            path: /opt/cni/bin
-        - name: multus-cfg
-          configMap:
-            name: multus-cni-config
-            items:
-            - key: cni-conf.json
-              path: 70-multus.conf
----
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: kube-multus-ds-ppc64le
-  namespace: kube-system
-  labels:
-    tier: node
-    app: multus
-spec:
-  updateStrategy:
-    type: RollingUpdate
-  template:
-    metadata:
-      labels:
-        tier: node
-        app: multus
-    spec:
-      hostNetwork: true
-      nodeSelector:
-        beta.kubernetes.io/arch: ppc64le
-      tolerations:
-      - operator: Exists
-        effect: NoSchedule
-      serviceAccountName: multus
-      containers:
-      - name: kube-multus
-        # ppc64le support requires multus:latest for now. support 3.3 or later.
-        image: nfvpe/multus:latest-ppc64le
-        command: ["/entrypoint.sh"]
-        args:
-        - "--multus-conf-file=auto"
-        resources:
-          requests:
-            cpu: "100m"
-            memory: "90Mi"
-          limits:
-            cpu: "100m"
-            memory: "90Mi"
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: cni
-          mountPath: /host/etc/cni/net.d
-        - name: cnibin
-          mountPath: /host/opt/cni/bin
-        - name: multus-cfg
-          mountPath: /tmp/multus-conf
-      volumes:
-        - name: cni
-          hostPath:
-            path: /etc/cni/net.d
-        - name: cnibin
-          hostPath:
-            path: /opt/cni/bin
-        - name: multus-cfg
-          configMap:
-            name: multus-cni-config
-            items:
-            - key: cni-conf.json
-              path: 70-multus.conf
diff --git a/deployment-configs/aether/clusters/production-central-azure.yml b/deployment-configs/aether/clusters/production-central-azure.yml
deleted file mode 100644
index 1573430..0000000
--- a/deployment-configs/aether/clusters/production-central-azure.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-name: production-central-azure
-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.55.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: azure.central
-      cluster_dns_server: 10.55.128.10
-      fail_swap_on: false
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.55.0.0/17
-      service_cluster_ip_range: 10.55.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 azure.central 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
-        }
-
-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/production-central-gcp.yml b/deployment-configs/aether/clusters/production-central-gcp.yml
deleted file mode 100644
index ac9b33e..0000000
--- a/deployment-configs/aether/clusters/production-central-gcp.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-name: production-central-gcp
-rancher_kubernetes_engine_config:
-  authentication:
-    strategy: x509
-  cloud_provider:
-    name: gce
-    customCloudProvider: |-
-      [global]
-      project-id = m-cord
-      network-project-id = onf-vpn
-      network-name = default
-      subnetwork-name = default
-      regional = true
-      multizone = true
-  ignore_docker_version: true
-  ingress:
-    provider: nginx
-  kubernetes_version: v1.15.6-rancher1-2
-  monitoring:
-    provider: none
-  network:
-    options:
-      calico_cloud_provider: gce
-    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.52.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: product.central
-      cluster_dns_server: 10.52.128.10
-      fail_swap_on: false
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.52.0.0/17
-      service_cluster_ip_range: 10.52.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: storage.k8s.io/v1
-    kind: StorageClass
-    metadata:
-      name: zonal-ssd
-    provisioner: kubernetes.io/gce-pd
-    parameters:
-      type: pd-ssd
-    ---
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      namespace: kube-system
-      name: coredns
-    data:
-      Corefile: |
-        .:53 {
-            errors
-            health
-            kubernetes product.central 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
-        }
-
-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/production-edge-intel.yaml b/deployment-configs/aether/clusters/production-edge-intel.yaml
deleted file mode 100644
index 49c1789..0000000
--- a/deployment-configs/aether/clusters/production-edge-intel.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: production-edge-intel
-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.212.74.128/25
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: intel.edge
-      cluster_dns_server: 10.212.74.138
-      fail_swap_on: false
-      extra_args:
-        cpu-manager-policy: static
-        kube-reserved: 'cpu=500m,memory=256Mi'
-        system-reserved: 'cpu=500m,memory=256Mi'
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.212.75.0/24
-      service_cluster_ip_range: 10.212.74.128/25
-      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 intel.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
-        }
-        product.central:53 {
-            errors
-            cache 30
-            forward . 10.52.128.10
-        }
-        aetherproject.net {
-            hosts {
-                10.168.0.3 rancher.central.aetherproject.net
-            }
-        }
-  addons_include:
-    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/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/production-edge-ntt.yaml b/deployment-configs/aether/clusters/production-edge-ntt.yaml
deleted file mode 100644
index cda0c20..0000000
--- a/deployment-configs/aether/clusters/production-edge-ntt.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: production-edge-ntt
-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.80.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: ntt.edge
-      cluster_dns_server: 10.80.128.10
-      fail_swap_on: false
-      extra_args:
-        cpu-manager-policy: static
-        kube-reserved: 'cpu=500m,memory=256Mi'
-        system-reserved: 'cpu=500m,memory=256Mi'
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.80.0.0/17
-      service_cluster_ip_range: 10.80.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 ntt.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
-        }
-        product.central:53 {
-            errors
-            cache 30
-            forward . 10.52.128.10
-        }
-        aetherproject.net {
-            hosts {
-                10.168.0.3 rancher.central.aetherproject.net
-            }
-        }
-  addons_include:
-    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/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/production-edge-onf-menlo.yml b/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
deleted file mode 100644
index 819f08d..0000000
--- a/deployment-configs/aether/clusters/production-edge-onf-menlo.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: production-edge-onf-menlo
-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.53.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: menlo.edge
-      cluster_dns_server: 10.53.128.10
-      fail_swap_on: false
-      extra_args:
-        cpu-manager-policy: static
-        kube-reserved: 'cpu=500m,memory=256Mi'
-        system-reserved: 'cpu=500m,memory=256Mi'
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.53.0.0/17
-      service_cluster_ip_range: 10.53.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 menlo.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
-        }
-        product.central:53 {
-            errors
-            cache 30
-            forward . 10.52.128.10
-        }
-        aetherproject.net {
-            hosts {
-                10.168.0.3 rancher.central.aetherproject.net
-            }
-        }
-  addons_include:
-    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/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/production-edge-onf-tucson.yml b/deployment-configs/aether/clusters/production-edge-onf-tucson.yml
deleted file mode 100644
index 30a0b0b..0000000
--- a/deployment-configs/aether/clusters/production-edge-onf-tucson.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: production-edge-onf-tucson
-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.59.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: tucson.edge
-      cluster_dns_server: 10.59.128.10
-      fail_swap_on: false
-      extra_args:
-        cpu-manager-policy: static
-        kube-reserved: 'cpu=500m,memory=256Mi'
-        system-reserved: 'cpu=500m,memory=256Mi'
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.59.0.0/17
-      service_cluster_ip_range: 10.59.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 tucson.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
-        }
-        product.central:53 {
-            errors
-            cache 30
-            forward . 10.52.128.10
-        }
-        aetherproject.net {
-            hosts {
-                10.168.0.3 rancher.central.aetherproject.net
-            }
-        }
-  addons_include:
-    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/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/production-edge-template.yaml b/deployment-configs/aether/clusters/production-edge-template.yaml
deleted file mode 100644
index 79f122d..0000000
--- a/deployment-configs/aether/clusters/production-edge-template.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: #SET_VALUE(production-edge-onf-menlo)
-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: #SET_VALUE(10.53.128.0/17)
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: #SET_VALUE(menlo.edge)
-      cluster_dns_server: #SET_VALUE(10.53.128.10)
-      fail_swap_on: false
-      extra_args:
-        cpu-manager-policy: static
-        kube-reserved: 'cpu=500m,memory=256Mi'
-        system-reserved: 'cpu=500m,memory=256Mi'
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: #SET_VALUE(10.53.0.0/17)
-      service_cluster_ip_range: #SET_VALUE(10.53.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 #SET_VALUE(menlo.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
-        }
-        product.central:53 {
-            errors
-            cache 30
-            forward . 10.52.128.10
-        }
-        aetherproject.net {
-            hosts {
-                10.168.0.3 rancher.central.aetherproject.net
-            }
-        }
-  addons_include:
-    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/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/production-global.yml b/deployment-configs/aether/clusters/production-global.yml
deleted file mode 100644
index 82c9d92..0000000
--- a/deployment-configs/aether/clusters/production-global.yml
+++ /dev/null
@@ -1,128 +0,0 @@
-name: production-global
-rancher_kubernetes_engine_config:
-  addon_job_timeout: 30
-  authentication:
-    strategy: x509
-  cloud_provider:
-    name: gce
-    customCloudProvider: |-
-      [global]
-      project-id = m-cord
-      network-project-id = onf-vpn
-      network-name = default
-      subnetwork-name = default
-      regional = true
-      multizone = true
-  ignore_docker_version: true
-  ingress:
-    provider: nginx
-  kubernetes_version: v1.15.6-rancher1-2
-  monitoring:
-    provider: none
-  network:
-    options:
-      calico_cloud_provider: gce
-    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.45.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: global
-      cluster_dns_server: 10.45.128.10
-      fail_swap_on: false
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.45.0.0/17
-      service_cluster_ip_range: 10.45.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
-  addons: |-
-    ---
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      namespace: kube-system
-      name: coredns
-    data:
-      Corefile: |
-        .:53 {
-            errors
-            health
-            kubernetes global 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
-        }
-        product.central:53 {
-            errors
-            cache 30
-            forward . 10.52.128.10
-        }
-        azure.central:53 {
-            errors
-            cache 30
-            forward . 10.55.128.10
-        }
-        menlo.edge:53 {
-            errors
-            cache 30
-            forward . 10.53.128.10
-        }
-        tucson.edge:53 {
-            errors
-            cache 30
-            forward . 10.59.128.10
-        }
-        intel.edge:53 {
-            errors
-            cache 30
-            forward . 10.212.74.138
-        }
-        ntt.edge:53 {
-            errors
-            cache 30
-            forward . 10.80.128.10
-        }
-
-windows_prefered_cluster: false
-local_cluster_auth_endpoint:
-  enabled: true
-docker_root_dir: /var/lib/docker
-enable_cluster_alerting: false
-enable_cluster_monitoring: false
-enable_network_policy: false
diff --git a/deployment-configs/aether/clusters/rancher.yml b/deployment-configs/aether/clusters/rancher.yml
deleted file mode 100644
index 90e1b11..0000000
--- a/deployment-configs/aether/clusters/rancher.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-cluster_name: aether-rancher
-kubernetes_version: "v1.15.6-rancher1-2"
-nodes:
-  - address: rancher-us-west2-a
-    user: aether
-    role: [controlplane,worker,etcd]
-  - address: rancher-us-west2-b
-    user: aether
-    role: [controlplane,worker,etcd]
-  - address: rancher-us-west2-c
-    user: aether
-    role: [controlplane,worker,etcd]
-cloud_provider:
-  name: gce
-  customCloudProvider: |-
-    [global]
-    project-id = m-cord
-    network-project-id = onf-vpn
-    network-name = default
-    subnetwork-name = default
-services:
-  etcd:
-    backup_config:
-      enabled: true
-      interval_hours: 6
-      retention: 60
-network:
-  plugin: calico
-  options:
-    calico_cloud_provider: gce
-monitoring:
-  provider: none
diff --git a/deployment-configs/aether/clusters/staging-central.yml b/deployment-configs/aether/clusters/staging-central.yml
deleted file mode 100644
index f203eeb..0000000
--- a/deployment-configs/aether/clusters/staging-central.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-name: staging-central-gcp
-rancher_kubernetes_engine_config:
-  authentication:
-    strategy: x509
-  cloud_provider:
-    name: gce
-    customCloudProvider: |-
-      [global]
-      project-id = m-cord
-      network-project-id = onf-vpn
-      network-name = default
-      subnetwork-name = default
-      regional = true
-      multizone = true
-  ignore_docker_version: true
-  ingress:
-    provider: nginx
-  kubernetes_version: v1.15.6-rancher1-2
-  monitoring:
-    provider: none
-  network:
-    options:
-      calico_cloud_provider: gce
-    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.47.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: staging.central
-      cluster_dns_server: 10.47.128.10
-      fail_swap_on: false
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.47.0.0/17
-      service_cluster_ip_range: 10.47.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: storage.k8s.io/v1
-    kind: StorageClass
-    metadata:
-      name: zonal-ssd
-    provisioner: kubernetes.io/gce-pd
-    parameters:
-      type: pd-ssd
-    ---
-    apiVersion: v1
-    kind: ConfigMap
-    metadata:
-      namespace: kube-system
-      name: coredns
-    data:
-      Corefile: |
-        .:53 {
-            errors
-            health
-            kubernetes staging.central 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
-        }
-
-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-onf-menlo.yml b/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
deleted file mode 100644
index a5f95ef..0000000
--- a/deployment-configs/aether/clusters/staging-edge-onf-menlo.yml
+++ /dev/null
@@ -1,101 +0,0 @@
-name: staging-edge-onf-menlo
-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.51.128.0/17
-      extra_args:
-        feature-gates: "SCTPSupport=True"
-    kubelet:
-      cluster_domain: menlo.staging.edge
-      cluster_dns_server: 10.51.128.10
-      fail_swap_on: false
-      extra_args:
-        cpu-manager-policy: static
-        kube-reserved: 'cpu=500m,memory=256Mi'
-        system-reserved: 'cpu=500m,memory=256Mi'
-        feature-gates: "SCTPSupport=True"
-    kube-controller:
-      cluster_cidr: 10.51.0.0/17
-      service_cluster_ip_range: 10.51.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 menlo.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
-        }
-        aetherproject.net {
-            hosts {
-                10.168.0.3 rancher.central.aetherproject.net
-            }
-        }
-  addons_include:
-    - https://raw.githubusercontent.com/opencord/pod-configs/master/deployment-configs/aether/clusters/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/comac-onf-testbed-helm-charts.yaml b/deployment-configs/comac-onf-testbed-helm-charts.yaml
deleted file mode 100644
index 81b6ac3..0000000
--- a/deployment-configs/comac-onf-testbed-helm-charts.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# 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.
-
-# Sample override values for 3-nodes cluster with SR-IOV configured on DP node.
-cassandra:
-  config:
-    cluster_size: 3
-
-# Accelleran CU images
-images:
-  tags:
-    nats: "10.90.0.150:5000/accelleran/vran-nats:20190121"
-    redis: "10.90.0.150:5000/accelleran/vran-redis:20190121"
-    vranL3: "10.90.0.150:5000/accelleran/vran-l3-fdd:20190121"
-
-config:
-  sriov:
-    resourceList:
-      vfio:
-        pfNames:
-          - eth2
-      netDevice:
-        pfNames:
-          - eth2
-        drivers:
-          - i40evf
-          - ixgbevf
-  mme:
-    ip: 10.90.0.151  # Used in Accelleran CU chart
-    cfgFiles:
-      config.json:
-        mme:
-          mcc:
-            dig1: 7
-            dig2: 3
-            dig3: 2
-          mnc:
-            dig1: 1
-            dig2: 1
-            dig3: 1
-  hss:
-    bootstrap:
-      enabled: true
-      users:
-        - 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
-  spgwu:
-    cpComm:
-      addr: 10.90.0.151
-      port: 30021
-    dpComm:
-      nodePort:
-        enabled: true
-        port: 30020
-  spgwc:
-    cpComm:
-      nodePort:
-        enabled: true
-        port: 30021
-    dpComm:
-      addr: 10.90.0.131
-      port: 30020
-# CDN configuration values
-  cdnRemotes:
-  - name: remote-1
-    ip: 10.90.0.151
-    port: 30935
-    streams:
-    - name: 360p
-      value: 360
-    - name: 480p
-      value: 480
-    - name: 720p
-      value: 720
-# Accelleran CU
-  nats:
-    ip: 10.90.0.151
-  progran:
-    enabled: true
-    ip: 10.90.0.151
-
-networks:
-  sgi:
-    gateway: 192.168.250.250 # Vyatta router IP
-
-# cord-platform values
-etcd-operator:
-  enabled: false
-
-# comac values
-seba-services:
-  enabled: false
diff --git a/deployment-configs/comac-onf-testbed-kubespray.yaml b/deployment-configs/comac-onf-testbed-kubespray.yaml
deleted file mode 100644
index 0be49dd..0000000
--- a/deployment-configs/comac-onf-testbed-kubespray.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# 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.
-
-# Sample kubespray override variables for COMAC deploy.
-# Pass this file as an extra variables when running kubespray. For example,
-# ansible-playbook -b -i inventory/comac/hosts.ini -e @inventory/comac/extra-vars.yaml cluster.yml
-# Tested with Kubespray release-2.11
-
-# OS
-disable_swap: true
-populate_inventory_to_hosts_file: true
-
-# etcd
-etcd_deployment_type: docker
-etcd_memory_limit: 8192M
-
-# Docker
-docker_iptables_enabled: true
-docker_insecure_registries:
-  - 10.90.0.150:5000
-
-# K8S
-kubeadm_enabled: true
-kubelet_deployment_type: host
-kubectl_localhost: true
-kubeconfig_localhost: true
-
-kube_feature_gates: [SCTPSupport=True]
-kube_pods_subnet: 172.18.0.0/17
-kube_service_addresses: 172.18.128.0/17
-kube_apiserver_node_port_range: 2000-36767
-kube_network_plugin: calico
-kube_network_plugin_multus: true
-multus_version: stable
-ipip: false
-
-local_volume_provisioner_enabled: true
-
-# Applications
-dns_mode: coredns
-dns_cores_per_replica: 256
-dns_min_replicas: 1
-
-helm_enabled: true
-helm_deployment_type: host
-helm_version: v2.16.1