diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index e1b4e4d..8b42306 100644
--- a/aether-roc-api/Chart.yaml
+++ b/aether-roc-api/Chart.yaml
@@ -7,8 +7,8 @@
 description: Aether ROC API
 kubeVersion: ">=1.15.0"
 type: application
-version: 1.7.0
-appVersion: v0.10.0
+version: 1.7.1
+appVersion: v0.10.1
 keywords:
   - aether
   - config
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index d5faa03..584b37f 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 2.1.0
+version: 2.1.1
 appVersion: v0.0.0
 keywords:
   - aether
@@ -32,7 +32,7 @@
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
-    version: 1.6.0
+    version: 1.7.1
   - name: aether-roc-websocket
     condition: import.aether-roc-websocket.enabled
     repository: "file://../aether-roc-websocket"
diff --git a/aether-roc-umbrella/files/opa-rbac/aether-2.1.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-2.1.0.rego
new file mode 100644
index 0000000..d764f4a
--- /dev/null
+++ b/aether-roc-umbrella/files/opa-rbac/aether-2.1.0.rego
@@ -0,0 +1,31 @@
+# SPDX-FileCopyrightText: 2022-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+package aether_2_1_x
+
+echo[config] {
+    config := input
+}
+
+allowed[config] {
+    enterprise := enterprise_rule
+    config := {
+        "connectivity_services": object.get(input, "connectivity_services", {}),
+        "enterprises": {
+            "enterprise": [
+                enterprise
+            ]
+        }
+    }
+}
+
+enterprise_rule[enterprise] {
+    enterprise := input.enterprises.enterprise[_]
+    ["AetherROCAdmin", enterprise.enterprise_id][_] == input.groups[i]
+}
+
+can_update_enterprise = true {
+    update_enterprise := input.updates.enterprises.enterprise[_]
+    ["AetherROCAdmin", update_enterprise.enterprise_id][_] == input.groups[i]
+}
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index 717e47a..4185308 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -35,19 +35,19 @@
     onos.topo.MastershipState: {}
 
 ---
-# The 4G/5G v4.0.0 sdcore-adapter
+# The 4G/5G v2.1.0 sdcore-adapter
 apiVersion: topo.onosproject.org/v1beta1
 kind: Entity
 metadata:
-  name: connectivity-service-v4
+  name: connectivity-service-v2-1
 spec:
-  uri: connectivity-service-v4
+  uri: connectivity-service-v2-1
   kind:
     name: aether
   aspects:
     onos.topo.Configurable:
-      address: sdcore-adapter-v4:5150
-      version: 4.0.18
+      address: sdcore-adapter-v2-1:5150
+      version: 2.1.x
       type: aether
     onos.topo.Location:
       lat: 52.5150
@@ -57,52 +57,3 @@
     onos.topo.Asset:
       name: 5G Core
     onos.topo.MastershipState: {}
-
----
-apiVersion: topo.onosproject.org/v1beta1
-kind: Kind
-metadata:
-  name: plproxy
-spec:
-  aspects: {}
-
----
-# Prom-label-proxy
-apiVersion: topo.onosproject.org/v1beta1
-kind: Entity
-metadata:
-  name: plproxy-amp
-spec:
-  uri: plproxy-amp
-  kind:
-    name: plproxy
-  aspects:
-    onos.topo.Configurable:
-      address: prom-label-proxy-amp:5150
-      version: 1.0.0
-      type: PLProxy
-    onos.topo.TLSOptions:
-      insecure: true
-    onos.topo.Asset:
-      name: Prom Label Proxy
-    onos.topo.MastershipState: {}
----
-# Prom-label-proxy
-apiVersion: topo.onosproject.org/v1beta1
-kind: Entity
-metadata:
-  name: plproxy-acc
-spec:
-  uri: plproxy-acc
-  kind:
-    name: plproxy
-  aspects:
-    onos.topo.Configurable:
-      address: prom-label-proxy-acc:5150
-      version: 1.0.0
-      type: PLProxy
-    onos.topo.TLSOptions:
-      insecure: true
-    onos.topo.Asset:
-      name: Prom Label Proxy
-    onos.topo.MastershipState: {}
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 4e06b30..cefc205 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -361,11 +361,11 @@
       enabled: false
   modelPlugins:
     - name: aether-2
-      image: onosproject/aether-2.0.x:2.0.2-aether-2.0.x
+      image: onosproject/aether-2.0.x:2.0.3-aether-2.0.x
       endpoint: localhost
       port: 5152
-    - name: aether-4
-      image: onosproject/aether-4.x:4.0.19-dev-aether-4.0.18
+    - name: aether-2-1
+      image: onosproject/aether-2.1.x:2.1.1-aether-2.1.x
       endpoint: localhost
       port: 5153