diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 63ddd5e..185527e 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.0.26
+version: 2.0.27
 appVersion: v0.0.0
 keywords:
   - aether
@@ -20,36 +20,19 @@
   - name: onos-topo
     condition: import.onos-topo.enabled
     repository: https://charts.onosproject.org
-    version: 1.1.109
-  - name: config-model-aether-2
-    condition: onos-config.models.aether.v2.enabled
-    repository: "file://../config-models/aether-2.0.x"
-    version: 2.0.10
-  - name: config-model-aether-4
-    condition: onos-config.models.aether.v4.enabled
-    repository: "file://../config-models/aether-4.x"
-    version: 4.0.18
-  - name: config-model-plproxy
-    condition: onos-config.models.plproxy.v1.enabled
-    repository: "file://../config-models/plproxy-1.x"
-    version: 1.0.2
-    alias: config-model-plproxy-1-0-0
+    version: 1.2.2
   - name: onos-config
     condition: import.onos-config.enabled
     repository: https://charts.onosproject.org
-    version: 1.4.6
-  - name: onos-gui
-    condition: import.onos-gui.enabled
-    repository: https://charts.onosproject.org
-    version: 1.0.8
+    version: 1.6.7
   - name: onos-cli
     condition: import.onos-cli.enabled
     repository: https://charts.onosproject.org
-    version: 1.1.11
+    version: 1.2.7
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
-    version: 1.4.7
+    version: 1.4.8
   - 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.0.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
index 3f79874..80ea78e 100644
--- a/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
+++ b/aether-roc-umbrella/files/opa-rbac/aether-2.0.0.rego
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-package aether_2_0_0
+package aether_2_0_x
 
 echo[config] {
     config := input
diff --git a/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego b/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
index 27a638f..f17cbcf 100644
--- a/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
+++ b/aether-roc-umbrella/files/opa-rbac/aether-4.0.0.rego
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-package aether_4_0_0
+package aether_4_0_18
 
 echo[config] {
     config := input
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index 18f393b..717e47a 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -23,8 +23,8 @@
   aspects:
     onos.topo.Configurable:
       address: sdcore-adapter-v2:5150
-      version: 2.0.0
-      type: Aether
+      version: 2.0.x
+      type: aether
     onos.topo.Location:
       lat: 52.5150
       lng: 13.3885
@@ -47,8 +47,8 @@
   aspects:
     onos.topo.Configurable:
       address: sdcore-adapter-v4:5150
-      version: 4.0.0
-      type: Aether
+      version: 4.0.18
+      type: aether
     onos.topo.Location:
       lat: 52.5150
       lng: 13.3885
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index bd4d9f0..abac6b5 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -35,8 +35,6 @@
     enabled: true
   onos-config:
     enabled: true
-  onos-gui:
-    enabled: false
   onos-cli:
     enabled: true
   aether-roc-api:
@@ -214,7 +212,7 @@
       username_claim: name
       email_claim: email
       jwk_set_url: "https://keycloak.opennetworking.org/auth/realms/master/protocol/openid-connect/certs"
-      cache_ttl: 60m  
+      cache_ttl: 60m
     auth.generic_oauth:
       enabled: true
       client_id: aether-roc-gui
@@ -310,7 +308,7 @@
           static_configs:
             - targets:
                 - demo-exporter:2112
-  
+
 prometheus-ace:
   pushgateway:
     enabled: false
@@ -346,17 +344,19 @@
   store:
     consensus:
       enabled: false
-  models:
-    aether:
-      v2:
-        enabled: true
-      v4:
-        enabled: true
-    plproxy:
-      v1:
-        enabled: true
+  modelPlugins:
+    - name: aether-2
+      image: onosproject/aether-2.0.x:2.0.0-dev-aether-2.0.x
+      endpoint: localhost
+      port: 5152
+    - name: aether-4
+      image: onosproject/aether-4.x:4.0.19-dev-aether-4.0.18
+      endpoint: localhost
+      port: 5153
+
   plugin:
     compiler:
+      version: v1.0.1
       target: ""
   openpolicyagent:
     enabled: true