diff --git a/Makefile b/Makefile
index c0ced28..78b1c7d 100644
--- a/Makefile
+++ b/Makefile
@@ -535,14 +535,14 @@
 	cd /etc/systemd/system && sudo rm -f aiab*.service && sudo systemctl daemon-reload
 
 ifeq ($(K8S_INSTALL),rke2)
-clean: | oaisim-clean router-clean clean-systemd
+clean: | roc-clean oaisim-clean router-clean clean-systemd
 	sudo /usr/local/bin/rke2-uninstall.sh || true
 	sudo rm -rf /usr/local/bin/kubectl
 	rm -rf $(M)
 endif
 
 ifeq ($(K8S_INSTALL),kubespray)
-clean: | oaisim-clean router-clean clean-systemd
+clean: | roc-clean oaisim-clean router-clean clean-systemd
 	source "$(VENV)/bin/activate" && cd $(BUILD)/kubespray; \
 	ansible-playbook -b -i inventory/local/hosts.ini reset.yml --extra-vars "reset_confirmation=yes"
 	@if [ -d /usr/local/etc/emulab ]; then \
diff --git a/aether-2.0/roc-4g-models.json b/aether-2.0/roc-4g-models.json
new file mode 100644
index 0000000..7c31ae2
--- /dev/null
+++ b/aether-2.0/roc-4g-models.json
@@ -0,0 +1,210 @@
+{
+    "default-target": "connectivity-service-v2",
+    "Updates": {
+        "connectivity-services-2.0.0": {
+            "connectivity-service": [
+                {
+                    "core-5g-endpoint": "http://config4g.omec.svc:5000/config",
+                    "description": "4G Integration Test",
+                    "display-name": "ROC 4G Test Connectivity Service",
+                    "connectivity-service-id": "aiab-cs"
+                }
+            ]
+        },
+        "enterprises-2.0.0": {
+            "enterprise": [
+                {
+                    "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
+                    "display-name": "Default Enterprise",
+                    "enterprise-id": "defaultent",
+                    "site": [
+                        {
+                            "description": "Global Default Site",
+                            "display-name": "Global Default Site",
+                            "site-id": "defaultent-defaultsite",
+                            "imsi-definition": {
+                                "mcc": "000",
+                                "mnc": "00",
+                                "enterprise": 0,
+                                "format": "SSSSSSSSSSSSSSS"
+                            },
+                            "device-group": [
+                                {
+                                    "display-name": "Unknown Inventory",
+                                    "device-group-id": "defaultent-defaultsite-default",
+                                    "mbr": {
+                                        "uplink": 1000000,
+                                        "downlink": 1000000
+                                    },
+                                    "traffic-class": "class-1",
+                                    "ip-domain": "defaultent-defaultip"
+                                }
+                            ],
+                            "ip-domain": [
+                                {
+                                    "admin-status": "ENABLE",
+                                    "description": "Global Default IP Domain",
+                                    "display-name": "Global Default IP Domain",
+                                    "dns-primary": "8.8.8.1",
+                                    "dns-secondary": "8.8.8.2",
+                                    "dnn": "dnnglobal",
+                                    "ip-domain-id": "defaultent-defaultip",
+                                    "mtu": 57600,
+                                    "subnet": "192.168.0.0/24"
+                                }
+                            ]
+                        }
+                    ],
+                    "traffic-class": [
+                        {
+                            "traffic-class-id": "class-1",
+                            "description": "High Priority TC",
+                            "display-name": "Class 1",
+                            "qci": 10,
+                            "arp": 1,
+                            "pelr": 10,
+                            "pdb": 100
+                        }
+                    ]
+                },
+                {
+                    "connectivity-service": [
+                        {
+                            "connectivity-service": "aiab-cs",
+                            "enabled": true
+                        }
+                    ],
+                    "description": "AiaB Enterprise",
+                    "display-name": "AiaB Corp.",
+                    "enterprise-id": "aiab-enterprise",
+                    "application": [],
+                    "site": [
+                        {
+                            "description": "AiaB test site",
+                            "display-name": "AiaB site",
+                            "site-id": "aiab-site",
+                            "imsi-definition": {
+                                "mcc": "208",
+                                "mnc": "01",
+                                "enterprise": 1,
+                                "format": "CCCNNEESSSSSSSS"
+                            },
+                            "device": [
+                                {
+                                    "device-id": "aiab-ue-1",
+                                    "display-name": "UE 1",
+                                    "sim-card": "aiab-sim-1"
+                                },
+                                {
+                                    "device-id": "aiab-ue-2",
+                                    "display-name": "UE 2",
+                                    "sim-card": "aiab-sim-2"
+                                }
+                            ],
+                            "sim-card": [
+                                {
+                                    "sim-id": "aiab-sim-1",
+                                    "display-name": "UE 1 Sim",
+                                    "imsi": 208010167891201
+                                },
+                                {
+                                    "sim-id": "aiab-sim-2",
+                                    "display-name": "UE 2 Sim",
+                                    "imsi": 208010167891202
+                                } 
+                            ],
+                            "device-group": [
+                                {
+                                    "display-name": "AiaB Users",
+                                    "device-group-id": "aiab-device-group",
+                                    "device": [
+                                        {
+                                            "device-id": "aiab-ue-1",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-2",
+                                            "enable": true
+                                        }
+                                    ],
+                                    "ip-domain": "aiab-ip-pool",
+                                    "mbr": {
+                                        "uplink": 1000000,
+                                        "downlink": 1000000
+                                    },
+                                    "traffic-class": "aiab-class-1"
+                                }
+                            ],
+                            "ip-domain": [
+                                {
+                                    "admin-status": "ENABLE",
+                                    "display-name": "IP pool",
+                                    "dnn": "internet",
+                                    "dns-primary": "8.8.8.8",
+                                    "ip-domain-id": "aiab-ip-pool",
+                                    "mtu": 1460,
+                                    "subnet": "172.250.0.0/16"
+                                }
+                            ],
+                            "small-cell": [
+                                {
+                                    "small-cell-id": "gnb1",
+                                    "display-name": "gNodeB 1",
+                                    "address": "aiab-gnb1",
+                                    "enable": true,
+                                    "tac": "0001"
+                                }
+                            ],
+                            "upf": [
+                                {
+                                    "address": "upf",
+                                    "display-name": "AiaB UPF",
+                                    "upf-id": "aiab-upf",
+                                    "port": 8805,
+                                    "config-endpoint": "http://upf-http.omec.svc:8080"
+                                }
+                            ],
+                            "slice": [
+                                {
+                                    "default-behavior": "ALLOW-ALL",
+                                    "display-name": "AiaB Slice",
+                                    "device-group": [
+                                        {
+                                            "device-group": "aiab-device-group",
+                                            "enable": true
+                                        }
+                                    ],
+                                    "filter": [],
+                                    "slice-id": "aiab-vcs",
+                                    "sd": 66051,
+                                    "sst": 1,
+                                    "upf": "aiab-upf",
+                                    "mbr": {
+                                        "uplink": 100000000,
+                                        "downlink": 100000000
+                                    },
+                                    "priority-traffic-rule": []
+                                }
+                            ]
+                        }
+                    ],
+                    "traffic-class": [
+                        {
+                            "display-name": "Default bearer QCI/ARP",
+                            "traffic-class-id": "aiab-class-1",
+                            "pdb": 300,
+                            "arp": 6,
+                            "pelr": 6,
+                            "qci": 9
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "Deletes": {},
+    "Extensions": {
+        "model-version-101": "2.0.0",
+        "model-type-102": "Aether"
+    }
+}
diff --git a/aether-2.0/roc-4g-models.json.license b/aether-2.0/roc-4g-models.json.license
new file mode 100644
index 0000000..b1480fd
--- /dev/null
+++ b/aether-2.0/roc-4g-models.json.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
diff --git a/aether-2.0/roc-5g-models.json b/aether-2.0/roc-5g-models.json
new file mode 100644
index 0000000..1cb5810
--- /dev/null
+++ b/aether-2.0/roc-5g-models.json
@@ -0,0 +1,392 @@
+{
+    "default-target": "connectivity-service-v2",
+    "Updates": {
+        "connectivity-services-2.0.0": {
+            "connectivity-service": [
+                {
+                    "core-5g-endpoint": "http://webui.omec.svc:5000/config",
+                    "description": "5G Integration Test",
+                    "display-name": "ROC 5G Test Connectivity Service",
+                    "connectivity-service-id": "aiab-cs"
+                }
+            ]
+        },
+        "enterprises-2.0.0": {
+            "enterprise": [
+                {
+                    "description": "This Enterprise holds discovered IMSIs that cannot be associated elsewhere.",
+                    "display-name": "Default Enterprise",
+                    "enterprise-id": "defaultent",
+                    "site": [
+                        {
+                            "description": "Global Default Site",
+                            "display-name": "Global Default Site",
+                            "site-id": "defaultent-defaultsite",
+                            "imsi-definition": {
+                                "mcc": "000",
+                                "mnc": "00",
+                                "enterprise": 0,
+                                "format": "SSSSSSSSSSSSSSS"
+                            },
+                            "device-group": [
+                                {
+                                    "display-name": "Unknown Inventory",
+                                    "device-group-id": "defaultent-defaultsite-default",
+                                    "mbr": {
+                                        "uplink": 1000000,
+                                        "downlink": 1000000
+                                    },
+                                    "traffic-class": "class-1",
+                                    "ip-domain": "defaultent-defaultip"
+                                }
+                            ],
+                            "ip-domain": [
+                                {
+                                    "admin-status": "ENABLE",
+                                    "description": "Global Default IP Domain",
+                                    "display-name": "Global Default IP Domain",
+                                    "dns-primary": "8.8.8.1",
+                                    "dns-secondary": "8.8.8.2",
+                                    "dnn": "dnnglobal",
+                                    "ip-domain-id": "defaultent-defaultip",
+                                    "mtu": 57600,
+                                    "subnet": "192.168.0.0/24"
+                                }
+                            ]
+                        }
+                    ],
+                    "traffic-class": [
+                        {
+                            "traffic-class-id": "class-1",
+                            "description": "High Priority TC",
+                            "display-name": "Class 1",
+                            "qci": 10,
+                            "arp": 1,
+                            "pelr": 10,
+                            "pdb": 100
+                        }
+                    ]
+                },
+                {
+                    "connectivity-service": [
+                        {
+                            "connectivity-service": "aiab-cs",
+                            "enabled": true
+                        }
+                    ],
+                    "description": "AiaB Enterprise",
+                    "display-name": "AiaB Corp.",
+                    "enterprise-id": "aiab-enterprise",
+                    "application": [],
+                    "site": [
+                        {
+                            "description": "AiaB test site",
+                            "display-name": "AiaB site",
+                            "site-id": "aiab-site",
+                            "imsi-definition": {
+                                "mcc": "208",
+                                "mnc": "93",
+                                "enterprise": 1,
+                                "format": "CCCNNEESSSSSSSS"
+                            },
+                            "device": [
+                                {
+                                    "device-id": "aiab-ue-1",
+                                    "display-name": "UE 1",
+                                    "sim-card": "aiab-sim-1"
+                                },
+                                {
+                                    "device-id": "aiab-ue-2",
+                                    "display-name": "UE 2",
+                                    "sim-card": "aiab-sim-2"
+                                },
+                                {
+                                    "device-id": "aiab-ue-3",
+                                    "display-name": "UE 3",
+                                    "sim-card": "aiab-sim-3"
+                                },
+                                {
+                                    "device-id": "aiab-ue-4",
+                                    "display-name": "UE 4",
+                                    "sim-card": "aiab-sim-4"
+                                },
+                                {
+                                    "device-id": "aiab-ue-5",
+                                    "display-name": "UE 5",
+                                    "sim-card": "aiab-sim-5"
+                                },
+                                {
+                                    "device-id": "aiab-ue-6",
+                                    "display-name": "UE 6",
+                                    "sim-card": "aiab-sim-6"
+                                },
+                                {
+                                    "device-id": "aiab-ue-7",
+                                    "display-name": "UE 7",
+                                    "sim-card": "aiab-sim-7"
+                                },
+                                {
+                                    "device-id": "aiab-ue-8",
+                                    "display-name": "UE 8",
+                                    "sim-card": "aiab-sim-8"
+                                },
+                                {
+                                    "device-id": "aiab-ue-9",
+                                    "display-name": "UE 9",
+                                    "sim-card": "aiab-sim-9"
+                                },
+                                {
+                                    "device-id": "aiab-ue-10",
+                                    "display-name": "UE 10",
+                                    "sim-card": "aiab-sim-10"
+                                },
+                                {
+                                    "device-id": "aiab-ue-11",
+                                    "display-name": "UE 11",
+                                    "sim-card": "aiab-sim-11"
+                                },
+                                {
+                                    "device-id": "aiab-ue-12",
+                                    "display-name": "UE 12",
+                                    "sim-card": "aiab-sim-12"
+                                },
+                                {
+                                    "device-id": "aiab-ue-13",
+                                    "display-name": "UE 13",
+                                    "sim-card": "aiab-sim-13"
+                                },
+                                {
+                                    "device-id": "aiab-ue-14",
+                                    "display-name": "UE 14",
+                                    "sim-card": "aiab-sim-14"
+                                },
+                                {
+                                    "device-id": "aiab-ue-15",
+                                    "display-name": "UE 15",
+                                    "sim-card": "aiab-sim-15"
+                                }
+                            ],
+                            "sim-card": [
+                                {
+                                    "sim-id": "aiab-sim-1",
+                                    "display-name": "UE 1 Sim",
+                                    "imsi": 208930100007487
+                                },
+                                {
+                                    "sim-id": "aiab-sim-2",
+                                    "display-name": "UE 2 Sim",
+                                    "imsi": 208930100007488
+                                },
+                                {
+                                    "sim-id": "aiab-sim-3",
+                                    "display-name": "UE 3 Sim",
+                                    "imsi": 208930100007489
+                                },
+                                {
+                                    "sim-id": "aiab-sim-4",
+                                    "display-name": "UE 4 Sim",
+                                    "imsi": 208930100007490
+                                },
+                                {
+                                    "sim-id": "aiab-sim-5",
+                                    "display-name": "UE 5 Sim",
+                                    "imsi": 208930100007491
+                                },
+                                {
+                                    "sim-id": "aiab-sim-6",
+                                    "display-name": "UE 6 Sim",
+                                    "imsi": 208930100007492
+                                },
+                                {
+                                    "sim-id": "aiab-sim-7",
+                                    "display-name": "UE 7 Sim",
+                                    "imsi": 208930100007493
+                                },
+                                {
+                                    "sim-id": "aiab-sim-8",
+                                    "display-name": "UE 8 Sim",
+                                    "imsi": 208930100007494
+                                },                                {
+                                    "sim-id": "aiab-sim-9",
+                                    "display-name": "UE 9 Sim",
+                                    "imsi": 208930100007495
+                                },
+                                {
+                                    "sim-id": "aiab-sim-10",
+                                    "display-name": "UE 10 Sim",
+                                    "imsi": 208930100007496
+                                },
+                                {
+                                    "sim-id": "aiab-sim-11",
+                                    "display-name": "UE 11 Sim",
+                                    "imsi": 208930100007497
+                                },
+                                {
+                                    "sim-id": "aiab-sim-12",
+                                    "display-name": "UE 12 Sim",
+                                    "imsi": 208930100007498
+                                },
+                                {
+                                    "sim-id": "aiab-sim-13",
+                                    "display-name": "UE 13 Sim",
+                                    "imsi": 208930100007499
+                                },
+                                {
+                                    "sim-id": "aiab-sim-14",
+                                    "display-name": "UE 14 Sim",
+                                    "imsi": 208930100007500
+                                },
+                                {
+                                    "sim-id": "aiab-sim-15",
+                                    "display-name": "UE 15 Sim",
+                                    "imsi": 208930100007501
+                                }
+                            ],
+                            "device-group": [
+                                {
+                                    "display-name": "AiaB Users",
+                                    "device-group-id": "aiab-device-group",
+                                    "device": [
+                                        {
+                                            "device-id": "aiab-ue-1",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-2",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-3",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-4",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-5",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-6",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-7",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-8",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-9",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-10",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-11",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-12",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-13",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-14",
+                                            "enable": true
+                                        },
+                                        {
+                                            "device-id": "aiab-ue-15",
+                                            "enable": true
+                                        }
+                                    ],
+                                    "ip-domain": "aiab-ip-pool",
+                                    "mbr": {
+                                        "uplink": 1000000,
+                                        "downlink": 1000000
+                                    },
+                                    "traffic-class": "aiab-class-1"
+                                }
+                            ],
+                            "ip-domain": [
+                                {
+                                    "admin-status": "ENABLE",
+                                    "display-name": "IP pool",
+                                    "dnn": "internet",
+                                    "dns-primary": "8.8.8.8",
+                                    "ip-domain-id": "aiab-ip-pool",
+                                    "mtu": 1460,
+                                    "subnet": "172.250.0.0/16"
+                                }
+                            ],
+                            "small-cell": [
+                                {
+                                    "small-cell-id": "gnb1",
+                                    "display-name": "gNodeB 1",
+                                    "address": "aiab-gnb1",
+                                    "enable": true,
+                                    "tac": "0001"
+                                }
+                            ],
+                            "upf": [
+                                {
+                                    "address": "upf",
+                                    "display-name": "AiaB UPF",
+                                    "upf-id": "aiab-upf",
+                                    "port": 8805,
+                                    "config-endpoint": "http://upf-http.omec.svc:8080"
+                                }
+                            ],
+                            "slice": [
+                                {
+                                    "default-behavior": "ALLOW-ALL",
+                                    "display-name": "AiaB Slice",
+                                    "device-group": [
+                                        {
+                                            "device-group": "aiab-device-group",
+                                            "enable": true
+                                        }
+                                    ],
+                                    "filter": [],
+                                    "slice-id": "aiab-vcs",
+                                    "sd": 66051,
+                                    "sst": 1,
+                                    "upf": "aiab-upf",
+                                    "mbr": {
+                                        "uplink": 10000000,
+                                        "downlink": 5000000
+                                    },
+                                    "priority-traffic-rule": []
+                                }
+                            ]
+                        }
+                    ],
+                    "traffic-class": [
+                        {
+                            "description": "High Priority TC",
+                            "display-name": "Class 1",
+                            "traffic-class-id": "aiab-class-1",
+                            "pdb": 100,
+                            "arp": 1,
+                            "pelr": 3,
+                            "qci": 1
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "Deletes": {},
+    "Extensions": {
+        "model-version-101": "2.0.0",
+        "model-type-102": "Aether"
+    }
+}
diff --git a/aether-2.0/roc-5g-models.json.license b/aether-2.0/roc-5g-models.json.license
new file mode 100644
index 0000000..b1480fd
--- /dev/null
+++ b/aether-2.0/roc-5g-models.json.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2021 Open Networking Foundation
+
+SPDX-License-Identifier: Apache-2.0
\ No newline at end of file
diff --git a/aether-2.0/roc-values.yaml b/aether-2.0/roc-values.yaml
new file mode 100644
index 0000000..503ae0e
--- /dev/null
+++ b/aether-2.0/roc-values.yaml
@@ -0,0 +1,89 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+global:
+  storage:
+    controller: "atomix-controller.kube-system:5679"
+  store:
+    consensus:
+      enabled: true
+      clusters: 1
+      replicas: 1
+      partitions: 1
+
+import:
+  aether-roc-gui:
+    v2_1:
+      enabled: false
+    v3:
+      enabled: false
+    v4:
+      enabled: false
+  sdcore-adapter:
+    v2_1:
+      enabled: false
+    v3:
+      enabled: false
+    v4:
+      enabled: false
+  sdcore-test-dummy:
+    enabled: false
+  prometheus:
+    acc:
+      enabled: false
+    amp:
+      enabled: false
+    ace:
+      enabled: false
+  demo-exporter:
+    enabled: false
+  prom-label-proxy:
+    acc:
+      enabled: false
+    amp:
+      enabled: false
+  subscriber-proxy:
+    enabled: false
+
+onos-gui:
+  ingress:
+    enabled: false
+  service:
+    type: NodePort
+
+aether-roc-gui-v2:
+  ingress:
+    enabled: false
+  grafana:
+    proxyEnabled: false
+  prometheus:
+    acc:
+      proxyEnabled: false
+    amp:
+      proxyEnabled: false
+    site: []
+  service:
+    type: NodePort
+
+prometheus-amp:
+  alertmanager:
+    persistentVolume:
+      enabled: false
+  server:
+    persistentVolume:
+      enabled: false
+prometheus-acc:
+  alertmanager:
+    persistentVolume:
+      enabled: false
+  server:
+    persistentVolume:
+      enabled: false
+prometheus-ace:
+  alertmanager:
+    persistentVolume:
+      enabled: false
+  server:
+    persistentVolume:
+      enabled: false
diff --git a/aether-2.0/sd-core-4g-values.yaml b/aether-2.0/sd-core-4g-values.yaml
new file mode 100644
index 0000000..0c5b257
--- /dev/null
+++ b/aether-2.0/sd-core-4g-values.yaml
@@ -0,0 +1,140 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+omec-control-plane:
+  enable4G: true
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+  # cassandra values
+  cassandra:
+    config:
+      cluster_size: 1
+      seed_size: 1
+  resources:
+    enabled: false
+
+  config:
+    managedByConfigPod:
+      enabled: true
+      # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
+    config4g:
+      deploy: true
+    hss:
+      bootstrap:
+        users: []
+        staticusers: []
+    spgwc:
+      pfcp: true
+      cfgFiles:
+        cp.json:
+          ip_pool_config:
+            ueIpPool:
+              ip: "172.250.0.0"
+              mask: "255.255.0.0"
+            staticUeIpPool:
+              ip: "172.250.1.0"
+              mask: "255.255.255.0"
+
+omec-sub-provision:
+  enable: true
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+  config:
+    simapp:
+      cfgFiles:
+        simapp.yaml:
+          configuration:
+            provision-network-slice: true
+            sub-provision-endpt:
+              addr: config4g.omec.svc.cluster.local
+            # sub-proxy-endpt:
+            #   addr: subscriber-proxy.aether-roc.svc.cluster.local
+            #   port: 5000
+            subscribers:
+            - ueId-start: 208010167891201
+              ueId-end: 208010167891211
+              plmnId: 20801
+              opc: "d4416644f6154936193433dd20a0ace0"
+              op: ""
+              key: "465b5ce8b199b49faa5f0a2ee238a6bc"
+              sequenceNumber: 96
+            device-groups:
+            - name:  "4g-oaisim-user"
+              imsis:
+                - "208010167891201"
+                - "208010167891202"
+              ip-domain-name: "pool1"
+              ip-domain-expanded:
+                dnn: internet
+                dns-primary: "8.8.8.8"
+                mtu: 1460
+                ue-ip-pool: "172.250.0.0/16"
+                ue-dnn-qos:
+                  dnn-mbr-downlink: 20000000
+                  dnn-mbr-uplink: 4000000
+                  bitrate-unit: bps
+                  traffic-class:  #default bearer QCI/ARP
+                    name: "platinum"
+                    qci: 9
+                    arp: 6
+                    pdb: 300
+                    pelr: 6
+              site-info: "aiab"
+            network-slices:
+            - name: "default"
+              slice-id:
+                sd: "010203"
+                sst: 1
+              site-device-group:
+              - "4g-oaisim-user"
+              application-filtering-rules:
+              - rule-name: "ALLOW-ALL"
+                priority: 250
+                action: "permit"
+                endpoint: "0.0.0.0/0"
+              site-info:
+                gNodeBs:
+                - name: "aiab-gnb1"
+                  tac: 1
+                plmn:
+                  mcc: "208"
+                  mnc: "01"
+                site-name: "aiab"
+                upf:
+                  upf-name: "upf"
+                  upf-port: 8805
+
+omec-user-plane:
+  enable: true
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+  resources:
+    enabled: false
+  config:
+    upf:
+      sriov:
+        enabled: false
+      hugepage:
+        enabled: false
+      cniPlugin: macvlan
+      ipam: static
+      routes:
+        - to: ${NODE_IP}
+          via: 169.254.1.1
+      enb:
+        subnet: ${RAN_SUBNET}
+      access:
+        iface: ${DATA_IFACE}
+      core:
+        iface: ${DATA_IFACE}
+      cfgFiles:
+        upf.json:
+          mode: af_packet
+          hwcksum: true
+
+5g-control-plane:
+  enable5G: false
+
+5g-ran-sim:
+  enable: false
diff --git a/aether-2.0/sd-core-5g-values.yaml b/aether-2.0/sd-core-5g-values.yaml
new file mode 100644
index 0000000..fae56ab
--- /dev/null
+++ b/aether-2.0/sd-core-5g-values.yaml
@@ -0,0 +1,256 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+5g-control-plane:
+  enable5G: true
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+
+  mongodb:
+    usePassword: false
+    persistence:
+      enabled: false
+  resources:
+    enabled: false
+
+  config:
+    managedByConfigPod:
+      enabled: true
+      # syncUrl: http://sdcore-adapter-v2.aether-roc.svc:8080/synchronize
+    smf:
+      cfgFiles:
+        # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+        smfcfg.conf:
+          configuration:
+            mongodb:       # the mongodb connected by this PCF
+              name: smf # name of the mongodb
+              url: mongodb://mongodb:27017
+    pcf:
+      cfgFiles:
+        # https://github.com/free5gc/free5gc/blob/main/config/pcfcfg.yaml
+        pcfcfg.conf:
+          info:
+            version: 1.0.0
+            description: PCF initial local configuration
+          configuration:
+            mongodb:       # the mongodb connected by this PCF
+              name: free5gc                  # name of the mongodb
+              url: mongodb://mongodb:27017
+    nrf:
+      cfgFiles:
+        # https://github.com/free5gc/free5gc/blob/main/config/nrfcfg.yaml
+        nrfcfg.conf:
+          configuration:
+            MongoDBName: free5gc # database name in MongoDB
+            MongoDBUrl: mongodb://mongodb:27017
+            #MongoDBUrl: mongodb://mongodb:27017 #works with db in omec name space
+
+omec-sub-provision:
+  enable: true
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+
+  config:
+    simapp:
+      cfgFiles:
+        simapp.yaml:
+          configuration:
+            provision-network-slice: true
+            sub-provision-endpt:
+              addr: webui.omec.svc.cluster.local
+            # sub-proxy-endpt:
+            #   addr: subscriber-proxy.aether-roc.svc.cluster.local
+            #   port: 5000
+            subscribers:
+            - ueId-start: 208930100007487
+              ueId-end: 208930100007501
+              plmnId: 20893
+              opc: "981d464c7c52eb6e5036234984ad0bcf"
+              op: ""
+              key: "5122250214c33e723a5dd523fc145fc0"
+              sequenceNumber: "16f3b3f70fc2"
+            device-groups:
+            - name:  "5g-gnbsim-user"
+              imsis:
+                - "208930100007487"
+                - "208930100007488"
+                - "208930100007489"
+                - "208930100007490"
+                - "208930100007491"
+                - "208930100007492"
+                - "208930100007493"
+                - "208930100007494"
+                - "208930100007495"
+                - "208930100007496"
+                - "208930100007497"
+                - "208930100007498"
+                - "208930100007499"
+                - "208930100007500"
+                - "208930100007501"
+              ip-domain-name: "pool1"
+              ip-domain-expanded:
+                dnn: internet
+                dns-primary: "8.8.8.8"
+                mtu: 1460
+                ue-ip-pool: "172.250.0.0/16"
+                ue-dnn-qos:
+                  dnn-mbr-downlink: 20000000
+                  dnn-mbr-uplink:    4000000
+                  bitrate-unit: bps
+                  traffic-class:  #default bearer QCI/ARP
+                    name: "platinum"
+                    qci: 9
+                    arp: 6
+                    pdb: 300
+                    pelr: 6
+              site-info: "aiab"
+            network-slices:
+            - name: "default"
+              slice-id:
+                sd: "010203"
+                sst: 1
+              site-device-group:
+              - "5g-gnbsim-user"
+              application-filtering-rules:
+              - rule-name: "ALLOW-ALL"
+                priority: 250
+                action: "permit"
+                endpoint: "0.0.0.0/0"
+              site-info:
+                gNodeBs:
+                - name: "aiab-gnb1"
+                  tac: 1
+                plmn:
+                  mcc: "208"
+                  mnc: "93"
+                site-name: "aiab"
+                upf:
+                  upf-name: "upf"
+                  upf-port: 8805
+
+omec-user-plane:
+  enable: true
+  resources:
+    enabled: false
+  config:
+    upf:
+      name: "oaisim"
+      sriov:
+        enabled: false
+      hugepage:
+        enabled: false
+      cniPlugin: macvlan
+      ipam: static
+      routes:
+        - to: ${NODE_IP}
+          via: 169.254.1.1
+      enb:
+        subnet: ${RAN_SUBNET}
+      access:
+        iface: ${DATA_IFACE}
+      core:
+        iface: ${DATA_IFACE}
+      cfgFiles:
+        upf.json:
+          mode: af_packet
+          hwcksum: true
+          log_level: "trace"
+          gtppsc: true
+          cpiface:
+            dnn: "internet"
+            hostname: "upf"
+
+5g-ran-sim:
+  enable: true
+  resources:
+    enabled: false
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+  #  tags:
+  #    gnbsim: add overriding image tag here
+  config:
+    gnbsim:
+      singleInterface: false #default multiInterface. Works well for AIAB
+      yamlCfgFiles:
+        gnb.conf:
+          logger:
+            logLevel: trace # how detailed the log will be, values: trace, debug, info, warn, error, fatal, panic
+          configuration:
+             #gnbs: # pool of gNodeBs
+             #  gnb1:
+             #    n3IpAddr: "POD_IP" # set if singleInterface is true
+             profiles: # profile information
+              - profileType: register # profile type
+                profileName: profile1 # uniqely identifies a profile within application
+                enable: false # Set true to execute the profile, false otherwise.
+                gnbName: gnb1 # gNB to be used for this profile
+                startImsi: 208930100007487 #First IMSI. Subsequent values will be used if ueCount is mo    re than 1
+                ueCount: 5 # Number of UEs for for which the profile will be executed
+                defaultAs: "192.168.250.1" #default icmp pkt destination
+                plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
+                  mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+                  mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+              - profileType: pdusessest
+                profileName: profile2
+                enable: true
+                gnbName: gnb1
+                startImsi: 208930100007492
+                ueCount: 5
+                defaultAs: "192.168.250.1" #default icmp pkt destination
+                plmnId:
+                  mcc: 208
+                  mnc: 93
+                dataPktCount: 5 # Number of UL user data packets to be transmitted. Common for all UEs
+              - profileType: anrelease
+                profileName: profile3
+                enable: false
+                gnbName: gnb1
+                startImsi: 208930100007497
+                ueCount: 5
+                defaultAs: "192.168.250.1" #default icmp pkt destination
+                plmnId:
+                  mcc: 208
+                  mnc: 93
+              - profileType: uetriggservicereq
+                profileName: profile4
+                enable: false
+                gnbName: gnb1
+                startImsi: 208930100007497
+                ueCount: 5
+                plmnId:
+                  mcc: 208
+                  mnc: 93
+                defaultAs: "192.168.250.1" #default icmp pkt destination
+              - profileType: deregister
+                profileName: profile5
+                enable: false
+                gnbName: gnb1
+                startImsi: 208930100007497
+                ueCount: 5
+                defaultAs: "192.168.250.1" #default icmp pkt destination
+                plmnId:
+                  mcc: 208
+                  mnc: 93
+              - profileType: nwtriggeruedereg # profile type
+                profileName: profile6 # uniqely identifies a profile within application
+                enable: false # Set true to execute the profile, false otherwise.
+                gnbName: gnb1 # gNB to be used for this profile
+                startImsi: 208930100007497 # First IMSI. Subsequent values will be used if ueCount is more than 1
+                ueCount: 5 # Number of UEs for for which the profile will be executed
+                defaultAs: "192.168.250.1" #default icmp pkt destination
+                perUserTimeout: 100 #if no expected event received in this time then treat it as failure
+                plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>. Should match startImsi
+                  mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+                  mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+              - profileType: uereqpdusessrelease # profile type
+                profileName: profile7 # uniqely identifies a profile within application
+                enable: false # Set true to execute the profile, false otherwise.
+                gnbName: gnb1 # gNB to be used for this profile
+                startImsi: 208930100007497 # First IMSI. Subsequent values will be used if ueCount is more than 1
+                ueCount: 5 # Number of UEs for for which the profile will be executed
+                plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>. Should match startImsi
+                  mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+                  mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+                defaultAs: "192.168.250.1" #default icmp pkt destinationomec-control-plane:
+  enable4G: false
diff --git a/configs/release-2.0 b/configs/release-2.0
index c7d07d4..4e19bb1 100644
--- a/configs/release-2.0
+++ b/configs/release-2.0
@@ -11,8 +11,8 @@
 ONOS_OPERATOR_CHART       := onosproject/onos-operator --version 0.5.1
 
 # Config files to use
-ROC_VALUES     := $(MAKEDIR)/roc-values.yaml
-ROC_4G_MODELS  := $(MAKEDIR)/roc-4g-models.json
-ROC_5G_MODELS  := $(MAKEDIR)/roc-5g-models.json
-4G_CORE_VALUES := $(MAKEDIR)/sd-core-4g-values.yaml
-5G_CORE_VALUES := $(MAKEDIR)/sd-core-5g-values.yaml
+ROC_VALUES     := $(MAKEDIR)/aether-2.0/roc-values.yaml
+ROC_4G_MODELS  := $(MAKEDIR)/aether-2.0/roc-4g-models.json
+ROC_5G_MODELS  := $(MAKEDIR)/aether-2.0/roc-5g-models.json
+4G_CORE_VALUES := $(MAKEDIR)/aether-2.0/sd-core-4g-values.yaml
+5G_CORE_VALUES := $(MAKEDIR)/aether-2.0/sd-core-5g-values.yaml