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: