diff --git a/aether-2.1/roc-4g-models.json b/aether-2.1/roc-4g-models.json
new file mode 100644
index 0000000..e175833
--- /dev/null
+++ b/aether-2.1/roc-4g-models.json
@@ -0,0 +1,135 @@
+{
+    "default-target": "aiab-enterprise",
+    "Updates": {
+        "site-2.1.0": [
+            {
+                "description": "AiaB test site",
+                "display-name": "AiaB site",
+                "site-id": "aiab-site",
+                "imsi-definition": {
+                    "mcc": "208",
+                    "mnc": "01",
+                    "enterprise": 1,
+                    "format": "CCCNNEESSSSSSSS"
+                },
+                "connectivity-service": {
+                    "core-4g": {
+                        "endpoint": "http://config4g.omec.svc:5000/config"
+                    }
+                },
+                "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",
+                        "connectivity-service": "4g",
+                        "sd": "010203",
+                        "sst": "1",
+                        "upf": "aiab-upf",
+                        "mbr": {
+                            "uplink": 100000000,
+                            "downlink": 100000000
+                        },
+                        "priority-traffic-rule": []
+                    }
+                ]
+            }
+        ],
+        "traffic-class-2.1.0": [
+            {
+                "display-name": "Default bearer QCI/ARP",
+                "traffic-class-id": "aiab-class-1",
+                "pdb": 300,
+                "arp": 6,
+                "pelr": 6,
+                "qci": 9
+            }
+        ]
+    },
+    "Deletes": {},
+    "Extensions": {
+        "transaction-strategy-111": 1
+    }
+}
diff --git a/aether-2.1/roc-4g-models.json.license b/aether-2.1/roc-4g-models.json.license
new file mode 100644
index 0000000..b1480fd
--- /dev/null
+++ b/aether-2.1/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.1/roc-5g-models.json b/aether-2.1/roc-5g-models.json
new file mode 100644
index 0000000..87fde98
--- /dev/null
+++ b/aether-2.1/roc-5g-models.json
@@ -0,0 +1,317 @@
+{
+    "default-target": "aiab-enterprise",
+    "Updates": {
+        "site-2.1.0": [
+            {
+                "description": "AiaB test site",
+                "display-name": "AiaB site",
+                "site-id": "aiab-site",
+                "imsi-definition": {
+                    "mcc": "208",
+                    "mnc": "93",
+                    "enterprise": 1,
+                    "format": "CCCNNEESSSSSSSS"
+                },
+                "connectivity-service": {
+                    "core-5g": {
+                        "endpoint": "http://webui.omec.svc:5000/config"
+                    }
+                },
+                "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",
+                        "connectivity-service": "5g",
+                        "sd": "010203",
+                        "sst": "1",
+                        "upf": "aiab-upf",
+                        "mbr": {
+                            "uplink": 10000000,
+                            "downlink": 5000000
+                        },
+                        "priority-traffic-rule": []
+                    }
+                ]
+            }
+        ],
+        "traffic-class-2.1.0": [
+            {
+                "description": "High Priority TC",
+                "display-name": "Class 1",
+                "traffic-class-id": "aiab-class-1",
+                "pdb": 100,
+                "arp": 1,
+                "pelr": 3,
+                "qci": 1
+            }
+        ]
+    },
+    "Deletes": {},
+    "Extensions": {
+        "transaction-strategy-111": 1
+    }
+}
diff --git a/aether-2.1/roc-5g-models.json.license b/aether-2.1/roc-5g-models.json.license
new file mode 100644
index 0000000..b1480fd
--- /dev/null
+++ b/aether-2.1/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.1/roc-values.yaml b/aether-2.1/roc-values.yaml
new file mode 100644
index 0000000..88d91e5
--- /dev/null
+++ b/aether-2.1/roc-values.yaml
@@ -0,0 +1,91 @@
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+global:
+  atomix:
+    storage:
+      controller: "atomix-controller.kube-system:5679"
+    store:
+      consensus:
+        enabled: true
+        clusters: 1
+        replicas: 3
+        partitions: 30
+
+import:
+  aether-roc-gui:
+    v2-1:
+      enabled: true
+    v2-0: # This is the new v2, not the old one...
+      enabled: false
+  sdcore-adapter:
+    v2-1:
+      enabled: true
+    v2-0: # This is the new v2, not the old one...
+      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
+
+aether-roc-gui-v2-1:
+  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
+
+sdcore-adapter-v2-1:
+  defaultTarget: aiab-enterprise
+
+enterprises:
+  - id: aiab-enterprise
+    name: AiaB Enterprise
+    lat: 52.5150
+    long: 13.3885
+  - id: defaultent
+    name: Default Enterprise
diff --git a/aether-2.1/sd-core-4g-values.yaml b/aether-2.1/sd-core-4g-values.yaml
new file mode 100644
index 0000000..0939739
--- /dev/null
+++ b/aether-2.1/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-1.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.1/sd-core-5g-values.yaml b/aether-2.1/sd-core-5g-values.yaml
new file mode 100644
index 0000000..77eb1bc
--- /dev/null
+++ b/aether-2.1/sd-core-5g-values.yaml
@@ -0,0 +1,446 @@
+# SPDX-FileCopyrightText: 2022-present Intel Corporation
+# Copyright 2019-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+omec-control-plane:
+  enable4G: false
+
+# Override values for 5g-control-plane helm chart
+# 5g-control-plane Helm Charts values - https://gerrit.opencord.org/sdcore-helm-charts/5g-control-plane/values.yaml
+
+5g-control-plane:
+  enable5G: true
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+    #tags:
+    #  amf: # add new image name
+    # refer above helm chart to add other NF images
+
+  kafka:
+    deploy: true
+
+  mongodb:
+    usePassword: false
+    persistence:
+      enabled: false
+    #enable following 2 lines if cluster needs to be enabled
+    architecture: replicaset
+    replicaCount: 2
+  resources:
+    enabled: false
+
+  config:
+    mongodb:
+      name: free5gc
+      url: mongodb://mongodb-arbiter-headless #enable if cluster deployment required
+
+    managedByConfigPod:
+      enabled: true
+      # syncUrl: http://sdcore-adapter-v2-1.aether-roc.svc:8080/synchronize
+
+    sctplb:
+      deploy: false # if enabled then deploy sctp pod. Once backend code is stable,
+                    # this option will be enabled by default
+
+    upfadapter:
+      deploy: false # if enabled then deploy upf adapter pod. Once backend code is stable,
+                    # this option will be enabled by default
+
+    metricfunc:
+      deploy: true
+
+    # Change AMF config here if rquired Most of the AMF config comes from Slice APIs
+    # but some of the config is directly provided  thorugh helm chart
+    amf:
+      # use externalIP if you need to access your AMF from remote setup and you don't
+      # want setup NodePort Service Type
+      #ngapp:
+        #externalIp: "128.110.219.37"
+        #port: 38412
+      cfgFiles:
+        amfcfg.conf:
+          configuration:
+            # storing AMF subscribers in the datastore is disabled by default. Once internal
+            # testing is complete we shall enable DBStore by default.
+            enableDBStore: false
+
+    # SMF config override. Refer helm chart values for more options
+    smf:
+      cfgFiles:
+        smfcfg.conf:
+          configuration:
+            # storing AMF subscribers in the datastore is disabled by default. Once internal
+            # testing is complete we shall enable DBStore by default.
+            enableDBStore: false
+
+    #pcf:
+    #  cfgFiles:
+    #    pcfcfg.conf:
+    #      configuration:
+
+    nrf:
+      cfgFiles:
+        nrfcfg.conf:
+          configuration:
+            mongoDBStreamEnable: false # enable/disable MongoDB stream in NRF. Keep it disabled for now.
+            nfProfileExpiryEnable: false  # if enabled then remove NF profile if no keepalive received
+            nfKeepAliveTime: 60  #default timeout for NF profiles. This value will be sent to registered NF during registration/update process.
+
+
+# Override values for omec-sub-provision helm chart
+# omec-control-plane Helm Charts values - https://gerrit.opencord.org/sdcore-helm-charts/omec-sub-provision/values.yaml
+omec-sub-provision:
+  enable: true
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+    #tags:
+    #  simapp: #add simapp override image
+
+  config:
+    simapp:
+      cfgFiles:
+        simapp.yaml:
+          configuration:
+            provision-network-slice: true # if enabled then Network Slices configured from simapp
+            sub-provision-endpt:
+              addr: webui.omec.svc.cluster.local  # subscriber configuation endpoint.
+            # sub-proxy-endpt:  #this is useful block if subscriber proxy is enabled in the ROC.
+            #   addr: subscriber-proxy.aether-roc.svc.cluster.local
+            #   port: 5000
+
+            # below block configures the subscribers and their security details.
+            # you can have any number of subscriber ranges
+            subscribers:
+            - ueId-start: "208930100007487"
+              ueId-end: "208930100007500"
+              plmnId: "20893"
+              opc: "981d464c7c52eb6e5036234984ad0bcf"
+              op: ""
+              key: "5122250214c33e723a5dd523fc145fc0"
+              sequenceNumber: "16f3b3f70fc2"
+            - ueId-start: "208930100007501"
+              ueId-end: "208930100007599"
+              plmnId: "20893"
+              opc: "981d464c7c52eb6e5036234984ad0bcf"
+              op: ""
+              key: "5122250214c33e723a5dd523fc145fc0"
+              sequenceNumber: "16f3b3f70fc2"
+
+            # Configure More than one device Group as per your need
+            device-groups:
+            - name:  "5g-gnbsim-user-group1"
+              imsis:
+                - "208930100007487"
+                - "208930100007488"
+                - "208930100007489"
+                - "208930100007490"
+                - "208930100007491"
+                - "208930100007492"
+                - "208930100007493"
+                - "208930100007494"
+                - "208930100007495"
+                - "208930100007496"
+                - "208930100007497"
+                - "208930100007498"
+                - "208930100007499"
+                - "208930100007500"
+              ip-domain-name: "pool1"
+              ip-domain-expanded:
+                dnn: internet
+                dns-primary: "8.8.8.8" # Change this as per your need. This value is sent to UE
+                mtu: 1460 # This value is sent to UE/Mobile/Subscriber during Subscriber PDU Session Est
+                ue-ip-pool: "172.250.1.0/16" # IP address pool for subscribers
+                ue-dnn-qos:
+                  dnn-mbr-downlink: 200000000 #ue level downlink qos
+                  dnn-mbr-uplink:    20000000 #ue level uplink qos
+                  bitrate-unit: bps #unit for qos rates mentioned above
+                  traffic-class:  #default bearer QCI/ARP. These values are not used in 5G as such
+                    name: "platinum"
+                    qci: 9
+                    arp: 6
+                    pdb: 300
+                    pelr: 6
+              site-info: "aiab"
+            #configure only 1 device group if you want UPF to allocate UE address.
+            #if smf is allocating IP address then having 2 separate pools is not a problem.
+            - name:  "5g-gnbsim-user-group2" # second device Group
+              imsis:
+                - "208930100007501"
+                - "208930100007502"
+                - "208930100007503"
+                - "208930100007504"
+                - "208930100007505"
+                - "208930100007506"
+                - "208930100007507"
+                - "208930100007508"
+                - "208930100007509"
+                - "208930100007510"
+              ip-domain-name: "pool2"
+              ip-domain-expanded:
+                dnn: internet
+                dns-primary: "8.8.8.8" # Change this as per your need. This value is sent to UE
+                mtu: 1460 # This value is sent to UE/Mobile/Subscriber during Subscriber PDU Session Est
+                ue-ip-pool: "172.250.1.0/16" # IP address pool for subscribers
+                ue-dnn-qos:
+                  dnn-mbr-downlink: 400000000
+                  dnn-mbr-uplink:    10000000
+                  bitrate-unit: bps # this value can be in gbps, mbps, kbps
+                  traffic-class:  #default bearer QCI/ARP
+                    name: "platinum"
+                    qci: 8
+                    arp: 6
+                    pdb: 300
+                    pelr: 6
+              site-info: "aiab2"
+            network-slices:
+            - name: "default" #provide any unique slice name
+              slice-id: #make sure this slice matches with slice configured in gNB, UE
+                sd: "010203"
+                sst: 1
+              site-device-group:
+              - "5g-gnbsim-user-group1"  #all UEs mentioned in this device group are assigned to this slice
+              - "5g-gnbsim-user-group2"
+              # below list of applicaiton filter controls what user can access.
+              # by default user can access all networks.
+              application-filtering-rules:
+              #all application information. Default, allow all applications
+              - rule-name: "ALLOW-ALL"
+                priority: 250
+                action: "permit"
+                endpoint: "0.0.0.0/0"
+              site-info:
+                # Provide gNBs and UPF details and also PLMN for the site
+                gNodeBs:
+                - name: "aiab-gnb1"
+                  tac: 1
+                - name: "aiab-gnb2"
+                  tac: 2
+                plmn:
+                  mcc: "208"
+                  mnc: "93"
+                site-name: "aiab"
+                upf:
+                  upf-name: "upf"  # associated UPF for this slice. One UPF per Slice. Provide fully qualified name
+                  upf-port: 8805
+
+# Override values for omec-user-plane helm chart
+# omec-user-plane Helm Charts values - https://gerrit.opencord.org/sdfabric-helm-charts/bess-upf/values.yaml
+
+omec-user-plane:
+  enable: true
+  resources:
+    enabled: false
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+    # uncomment below section to add update bess image tag
+    #tags:
+    #  bess: <bess image tag>
+    #  pfcpiface: <pfcp image tag>
+  config:
+    upf:
+      name: "oaisim"
+      sriov:
+        enabled: false #default sriov is disabled in AIAB setup
+      hugepage:
+        enabled: false #should be enabled if dpdk is enabled
+      #can be any other plugin as well, remember this plugin dictates how IP address are assigned.
+      cniPlugin: macvlan
+      ipam: static
+      routes:
+        - to: ${NODE_IP}
+          via: 169.254.1.1
+      enb:
+        subnet: ${RAN_SUBNET} #this is your gNB network
+      access:
+        iface: ${DATA_IFACE}
+      core:
+        iface: ${DATA_IFACE}
+      cfgFiles:
+        upf.json:
+          mode: af_packet  #this mode means no dpdk
+          hwcksum: true
+          log_level: "trace"
+          gtppsc: true #extension header is enabled in 5G. Sending QFI in pdu session extension header
+          cpiface:
+            dnn: "internet" #keep it matching with Slice dnn
+            hostname: "upf"
+            #http_port: "8080"
+            enable_ue_ip_alloc: false # if true then it means UPF allocates address from below pool
+            ue_ip_pool: "172.250.0.0/16" # UE ip pool is used if enable_ue_ip_alloc is set to true
+
+# Override values for 5g-ran-sim helm chart
+# 5g-ran-sim Helm Charts values - https://gerrit.opencord.org/sdcore-helm-charts/5g-ran-sim/values.yaml
+
+5g-ran-sim:
+  enable: ${ENABLE_GNBSIM}
+  resources:
+    enabled: false
+  images:
+    repository: "registry.opennetworking.org/docker.io/"
+    #tags:
+    #  gnbsim: 5gc-gnbsim:0.0.1-dev-local5
+  config:
+    gnbsim:
+      singleInterface: false #default multiInterface. Works well for AIAB
+      execInParallel: false #run all profiles in parallel
+      goProfile:
+        enable: false #enable/disable golang profile in gnbsim
+        port: 5000
+      httpServer:
+        enable: false #enable httpServer in gnbsim
+        port: 6000
+      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
+              gnbs: # pool of gNodeBs
+               gnb1:
+                 defaultAmf:
+                   hostName: amf # Host name of AMF
+                   port: 38412 # AMF port
+              customProfiles:
+                customProfiles1:
+                  profileType: custom # profile type
+                  profileName: custom1 # uniquely identifies a profile within application
+                  enable: false # Set true to execute the profile, false otherwise.
+                  execInParallel: false #run all subscribers in parallel.
+                  stepTrigger: false #wait for trigger to move to next step
+                  gnbName: gnb1 # gNB to be used for this profile
+                  startImsi: 208930100007487
+                  ueCount: 30
+                  defaultAs: "192.168.250.1" #default icmp pkt destination
+                  opc: "981d464c7c52eb6e5036234984ad0bcf"
+                  key: "5122250214c33e723a5dd523fc145fc0"
+                  sequenceNumber: "16f3b3f70fc2"
+                  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)
+                  # start from "startiteration" and then move through all the iteration till quit
+                  startiteration: iteration1
+                  iterations:
+                    - "name": "iteration1"
+                      "1": "REGISTRATION-PROCEDURE 5"
+                      "2": "PDU-SESSION-ESTABLISHMENT-PROCEDURE 5"
+                      "3": "USER-DATA-PACKET-GENERATION-PROCEDURE 10"
+                      "next":  "iteration2"
+                    - "name": "iteration2"
+                      "1": "AN-RELEASE-PROCEDURE 10"
+                      "2": "UE-TRIGGERED-SERVICE-REQUEST-PROCEDURE 5"
+                      "repeat": 0 #default value 0 . i.e execute once
+                      "next":  "iteration3" #default value quit. i.e. no further iteration to run
+                    - "name": "iteration3"
+                      "1": "UE-INITIATED-DEREGISTRATION-PROCEDURE 10"
+                      "repeat": 0 #default value 0 . i.e execute once
+                      "next":  "quit" #default value quit. i.e. no further iteration to run
+              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
+                execInParallel: false #run all subscribers in this profile parallel
+                startImsi: 208930100007487 #First IMSI. Subsequent values will be used if ueCount is mo    re than 1
+                ueCount: 5 # Number of UEs 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>
+                  mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
+                  mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
+                opc: "981d464c7c52eb6e5036234984ad0bcf"
+                key: "5122250214c33e723a5dd523fc145fc0"
+                sequenceNumber: "16f3b3f70fc2"
+              - profileType: pdusessest
+                profileName: profile2
+                enable: true
+                gnbName: gnb1
+                execInParallel: false #run all subscribers in this profile parallel
+                startImsi: 208930100007487
+                ueCount: 5
+                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:
+                  mcc: 208
+                  mnc: 93
+                dataPktCount: 5 # Number of UL user data packets to be transmitted. Common for all UEs
+                opc: "981d464c7c52eb6e5036234984ad0bcf"
+                key: "5122250214c33e723a5dd523fc145fc0"
+                sequenceNumber: "16f3b3f70fc2"
+              - profileType: anrelease
+                profileName: profile3
+                enable: false
+                execInParallel: false #run all subscribers in this profile parallel
+                gnbName: gnb1
+                startImsi: 208930100007497
+                ueCount: 5
+                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:
+                  mcc: 208
+                  mnc: 93
+                opc: "981d464c7c52eb6e5036234984ad0bcf"
+                key: "5122250214c33e723a5dd523fc145fc0"
+                sequenceNumber: "16f3b3f70fc2"
+              - profileType: uetriggservicereq
+                profileName: profile4
+                enable: false
+                gnbName: gnb1
+                execInParallel: false #run all subscribers in this profile parallel
+                startImsi: 208930100007497
+                ueCount: 5
+                plmnId:
+                  mcc: 208
+                  mnc: 93
+                defaultAs: "192.168.250.1" #default icmp pkt destination
+                perUserTimeout: 100 #if no expected event received in this time then treat it as failure
+                opc: "981d464c7c52eb6e5036234984ad0bcf"
+                key: "5122250214c33e723a5dd523fc145fc0"
+                sequenceNumber: "16f3b3f70fc2"
+              - profileType: deregister
+                profileName: profile5
+                enable: false
+                gnbName: gnb1
+                execInParallel: false #run all subscribers in this profile parallel
+                startImsi: 208930100007497
+                ueCount: 5
+                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:
+                  mcc: 208
+                  mnc: 93
+                opc: "981d464c7c52eb6e5036234984ad0bcf"
+                key: "5122250214c33e723a5dd523fc145fc0"
+                sequenceNumber: "16f3b3f70fc2"
+              - 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
+                execInParallel: false #run all subscribers in this profile parallel
+                startImsi: 208930100007497 # First IMSI. Subsequent values will be used if ueCount is more than 1
+                ueCount: 5 # Number of UEs 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)
+                opc: "981d464c7c52eb6e5036234984ad0bcf"
+                key: "5122250214c33e723a5dd523fc145fc0"
+                sequenceNumber: "16f3b3f70fc2"
+              - 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
+                execInParallel: false #run all subscribers in this profile parallel
+                startImsi: 208930100007497 # First IMSI. Subsequent values will be used if ueCount is more than 1
+                ueCount: 5 # Number of UEs 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 destination
+                perUserTimeout: 100 #if no expected event received in this time then treat it as failure
+                opc: "981d464c7c52eb6e5036234984ad0bcf"
+                key: "5122250214c33e723a5dd523fc145fc0"
+                sequenceNumber: "16f3b3f70fc2"
diff --git a/configs/release-2.1 b/configs/release-2.1
new file mode 100644
index 0000000..a06c447
--- /dev/null
+++ b/configs/release-2.1
@@ -0,0 +1,22 @@
+# Copyright 2021-present Open Networking Foundation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+SD_CORE_CHART            := aether/sd-core --version 0.12.5
+
+# For installing the ROC
+AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 2.1.33
+
+# For Aether 2.1, Atomix controller and raft storage have been removed
+# ATOMIX_CONTROLLER_CHART   := atomix/atomix-controller --version 0.6.9
+# ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.25
+
+ATOMIX_RUNTIME_CHART      := atomix/atomix-runtime --version 0.1.9
+ONOS_OPERATOR_CHART       := onosproject/onos-operator --version 0.5.6
+
+# Config files to use
+ROC_VALUES     := $(MAKEDIR)/aether-2.1/roc-values.yaml
+ROC_4G_MODELS  := $(MAKEDIR)/aether-2.1/roc-4g-models.json
+ROC_5G_MODELS  := $(MAKEDIR)/aether-2.1/roc-5g-models.json
+4G_CORE_VALUES := $(MAKEDIR)/aether-2.1/sd-core-4g-values.yaml
+5G_CORE_VALUES := $(MAKEDIR)/aether-2.1/sd-core-5g-values.yaml