diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index f34d0be..5e8605c 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.2.0
-appVersion: v0.8.0
+version: 1.2.1
+appVersion: v0.8.2
 keywords:
   - aether
   - config
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
index 18d7348..a8f9f00 100644
--- a/aether-roc-api/values.yaml
+++ b/aether-roc-api/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/aether-roc-api
-  tag: v0.8.0
+  tag: v0.8.2
   pullPolicy: IfNotPresent
   pullSecrets: []
   websocketsidecar:
diff --git a/aether-roc-gui-v4/Chart.yaml b/aether-roc-gui-v4/Chart.yaml
index 680696e..7bb91c4 100644
--- a/aether-roc-gui-v4/Chart.yaml
+++ b/aether-roc-gui-v4/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 4.0.0
+version: 4.0.1
 appVersion: 4.0.0
 keywords:
   - aether
diff --git a/aether-roc-gui-v4/values.yaml b/aether-roc-gui-v4/values.yaml
index 27904c1..3b322ab 100644
--- a/aether-roc-gui-v4/values.yaml
+++ b/aether-roc-gui-v4/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/aether-roc-gui
-  tag: v0.8.0
+  tag: v0.8.1
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index 5a04ef9..c357837 100644
--- a/aether-roc-gui/Chart.yaml
+++ b/aether-roc-gui/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 3.0.25
+version: 3.0.26
 appVersion: 3.0.0
 keywords:
   - aether
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
index 76687f4..4465786 100644
--- a/aether-roc-gui/values.yaml
+++ b/aether-roc-gui/values.yaml
@@ -10,7 +10,7 @@
 
 image:
   repository: onosproject/aether-roc-gui
-  tag: v0.7.25
+  tag: v0.7.26
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index d870354..c12515e 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: 1.4.8
+version: 1.4.9
 appVersion: v0.0.0
 keywords:
   - aether
@@ -21,10 +21,6 @@
     condition: import.onos-topo.enabled
     repository: https://charts.onosproject.org
     version: 1.1.102
-  - name: config-model-aether-2
-    condition: onos-config.models.aether.v2_1.enabled
-    repository: "file://../config-models/aether-2.1.x"
-    version: 2.1.4
   - name: config-model-aether-3
     condition: onos-config.models.aether.v3.enabled
     repository: "file://../config-models/aether-3.x"
@@ -48,15 +44,15 @@
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
-    version: 1.2.0
+    version: 1.2.1
   - name: aether-roc-gui
     condition: import.aether-roc-gui.v3.enabled
     repository: "file://../aether-roc-gui"
-    version: 3.0.25
+    version: 3.0.26
   - name: aether-roc-gui-v4
     condition: import.aether-roc-gui.v4.enabled
     repository: "file://../aether-roc-gui-v4"
-    version: 4.0.0
+    version: 4.0.1
   - name: sdcore-adapter
     condition: import.sdcore-adapter.v3.enabled
     repository: "file://../sdcore-adapter"
diff --git a/aether-roc-umbrella/tests/aether-roc-umbrella.go b/aether-roc-umbrella/tests/aether-roc-umbrella.go
index 54984f4..638a0d6 100644
--- a/aether-roc-umbrella/tests/aether-roc-umbrella.go
+++ b/aether-roc-umbrella/tests/aether-roc-umbrella.go
@@ -57,12 +57,10 @@
 		SetUsername(username).
 		SetPassword(password).
 		WithTimeout(15*time.Minute).
-		Set("onos-ric.service.external.nodePort", 0).
-		Set("onos-ric-ho.service.external.nodePort", 0).
-		Set("onos-ric-mlb.service.external.nodePort", 0).
 		Set("import.onos-gui.enabled", false).
 		Set("import.aether-roc-gui.v2_1.enabled", false).
 		Set("import.aether-roc-gui.v3.enabled", false).
+		Set("import.aether-roc-gui.v4.enabled", false).
 		Set("import.onos-cli.enabled", false).
 		Set("onos-topo.image.tag", "latest").
 		Set("onos-config.image.tag", "latest").
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index c1d470b..07598bb 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -42,12 +42,10 @@
   aether-roc-api:
     enabled: true
   aether-roc-gui:
-    v2_1:
-      enabled: false
     v3:
-      enabled: true
-    v4:
       enabled: false
+    v4:
+      enabled: true
   sdcore-adapter:
     v3:
       enabled: true
@@ -242,10 +240,6 @@
       enabled: false
   models:
     aether:
-      v2_1:
-        enabled: true
-      v2_2:
-        enabled: false
       v3:
         enabled: true
       v4: