diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index f77f268..e48037f 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.4
+version: 1.4.5
 appVersion: v0.0.0
 keywords:
   - aether
@@ -21,21 +21,18 @@
     condition: import.onos-topo.enabled
     repository: https://charts.onosproject.org
     version: 1.1.102
-  - name: config-model-aether
+  - name: config-model-aether-2
     condition: onos-config.models.aether.v2_1.enabled
     repository: "file://../config-models/aether-2.1.x"
-    version: 2.1.3
-    alias: config-model-aether-2-1-0
-  - name: config-model-aether
+    version: 2.1.4
+  - name: config-model-aether-3
     condition: onos-config.models.aether.v3.enabled
     repository: "file://../config-models/aether-3.x"
-    version: 3.0.13
-    alias: config-model-aether-3-0-0
-  - name: config-model-aether
+    version: 3.0.14
+  - name: config-model-aether-4
     condition: onos-config.models.aether.v4.enabled
     repository: "file://../config-models/aether-4.x"
-    version: 4.0.4
-    alias: config-model-aether-4-0-0
+    version: 4.0.5
   - name: onos-config
     condition: import.onos-config.enabled
     repository: https://charts.onosproject.org
@@ -56,12 +53,10 @@
     condition: import.aether-roc-gui.v3.enabled
     repository: "file://../aether-roc-gui"
     version: 3.0.24
-    alias: aether-roc-gui-v3
   - name: sdcore-adapter
     condition: import.sdcore-adapter.v3.enabled
     repository: "file://../sdcore-adapter"
     version: 3.0.15
-    alias: sdcore-adapter-v3
   - name: subscriber-proxy
     condition: import.subscriber-proxy.enabled
     repository: "file://../subscriber-proxy"
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 9edc47b..e82ef74 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -49,8 +49,6 @@
     v4:
       enabled: true
   sdcore-adapter:
-    v2_1:
-      enabled: true
     v3:
       enabled: true
   subscriber-proxy:
@@ -78,7 +76,7 @@
 aether-roc-api: {}
 
 # Aether ROC GUI
-aether-roc-gui-v3:
+aether-roc-gui:
   websocket:
     proxyEnabled: true
   grafana:
@@ -89,9 +87,9 @@
     service: aether-roc-umbrella-prometheus-server
 
 # SD-Core Adapter
-sdcore-adapter-v21:
-  nameOverride: sdcore-adapter-v21
-  fullnameOverride: sdcore-adapter-v21
+sdcore-adapter:
+  nameOverride: sdcore-adapter-v3
+  fullnameOverride: sdcore-adapter-v3
   prometheusEnabled: false
 
 # Subscriber Proxy
@@ -100,11 +98,6 @@
   fullnameOverride: subscriber-proxy
   prometheusEnabled: false
 
-sdcore-adapter-v3:
-  nameOverride: sdcore-adapter-v3
-  fullnameOverride: sdcore-adapter-v3
-  prometheusEnabled: false
-
 grafana:
   orgs:
     acme:
diff --git a/config-models/aether-2.1.x/Chart.yaml b/config-models/aether-2.1.x/Chart.yaml
index e7ddb89..fb7fc19 100644
--- a/config-models/aether-2.1.x/Chart.yaml
+++ b/config-models/aether-2.1.x/Chart.yaml
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 apiVersion: v2
-name: config-model-aether
-version: 2.1.3
+name: config-model-aether-2
+version: 2.1.4
 kubeVersion: ">=1.18.0"
 appVersion: 2.1.0
 description: Aether config model
diff --git a/config-models/aether-3.x/Chart.yaml b/config-models/aether-3.x/Chart.yaml
index 79c5a63..1d77b11 100644
--- a/config-models/aether-3.x/Chart.yaml
+++ b/config-models/aether-3.x/Chart.yaml
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 apiVersion: v2
-name: config-model-aether
-version: 3.0.13
+name: config-model-aether-3
+version: 3.0.14
 kubeVersion: ">=1.18.0"
 appVersion: 3.0.0
 description: Aether config model
diff --git a/config-models/aether-4.x/Chart.yaml b/config-models/aether-4.x/Chart.yaml
index fbb3971..a63eed5 100644
--- a/config-models/aether-4.x/Chart.yaml
+++ b/config-models/aether-4.x/Chart.yaml
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
 apiVersion: v2
-name: config-model-aether
-version: 4.0.4
+name: config-model-aether-4
+version: 4.0.5
 kubeVersion: ">=1.18.0"
 appVersion: 4.0.0
 description: Aether config model