diff --git a/.gitignore b/.gitignore
index 14e0952..4a402f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 fabric-umbrella/Chart.lock
 fabric-umbrella/charts
 .idea
+.DS_Store
+*/.DS_Store
diff --git a/Makefile b/Makefile
index e33d270..b339261 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,6 @@
 roc-test: deps # @HELP run the integration tests
 	./build/bin/run-roc-test
 
-fabric-test: deps-fabric # @HELP run the integration tests
-	./build/bin/run-fabric-test
-
 clean: # @HELP clean up temporary files for ROC umbrella.
 	rm -rf aether-roc-umbrella/charts aether-roc-umbrella/Chart.lock chronos-umbrella/charts chronos-umbrella/Chart.lock fabric-umbrella/charts fabric-umbrella/Chart.lock
 
@@ -42,11 +39,6 @@
 	rm -rf chronos-umbrella/Chart.lock chronos-umbrella/charts
 	helm dep build chronos-umbrella
 
-deps-fabric: # @HELP build dependencies for Fabric Umbrella local charts.
-deps-fabric: clean
-	rm -rf fabric-umbrella/Chart.lock fabric-umbrella/charts
-	helm dep build fabric-umbrella
-
 help:
 	@grep -E '^.*: *# *@HELP' $(MAKEFILE_LIST) \
     | sort \
diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index 12e23a3..580a65c 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.13
-appVersion: v0.10.18
+version: 1.7.14
+appVersion: v0.10.26
 keywords:
   - aether
   - config
diff --git a/aether-roc-api/values.yaml b/aether-roc-api/values.yaml
index d05fe06..e89deee 100644
--- a/aether-roc-api/values.yaml
+++ b/aether-roc-api/values.yaml
@@ -15,8 +15,6 @@
   pullSecrets: []
 
 imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: "aether-roc-api"
 
 gnmiEndpoint: onos-config:5150
 analyticsEndpoint: http://aether-roc-umbrella-prometheus-acc-server:9090
diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index 28977b6..26fc14c 100644
--- a/aether-roc-gui/Chart.yaml
+++ b/aether-roc-gui/Chart.yaml
@@ -7,8 +7,8 @@
 description: Aether ROC Graphical User Interface
 kubeVersion: ">=1.15.0"
 type: application
-version: 2.1.18
-appVersion: v0.9.25
+version: 2.1.19
+appVersion: v0.10.1
 keywords:
   - aether
   - roc
diff --git a/aether-roc-gui/templates/configmap.yaml b/aether-roc-gui/templates/configmap.yaml
index 4fdb450..99075d2 100644
--- a/aether-roc-gui/templates/configmap.yaml
+++ b/aether-roc-gui/templates/configmap.yaml
@@ -18,7 +18,7 @@
         ssl_certificate_key /usr/share/certs/aether-roc-gui.key;
         {{- if .Values.grafana.proxyEnabled }}
         location /grafana/ {
-            proxy_pass {{ .Values.grafana.protocol }}://{{ .Values.grafana.service }}:{{ .Values.grafana.port }}/;
+            proxy_pass {{ .Values.grafana.protocol }}://{{tpl (.Values.grafana.service | default .Values.grafana.service) . }}:{{ .Values.grafana.port }}/;
             proxy_http_version 1.1;
             proxy_redirect off;
             proxy_set_header Upgrade $http_upgrade;
@@ -32,21 +32,21 @@
         }{{end}}
         {{- if .Values.prometheus.acc.proxyEnabled }}
         location /prometheus-acc/ {
-            proxy_pass {{ .Values.prometheus.acc.protocol }}://{{ .Values.prometheus.acc.service }}:{{ .Values.prometheus.acc.port }}/;
+            proxy_pass {{ .Values.prometheus.acc.protocol }}://{{tpl (.Values.prometheus.acc.service | default .Values.prometheus.acc.service) . }}:{{ .Values.prometheus.acc.port }}/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             add_header X-Frame-Options SAMEORIGIN;
         }{{end}}
         {{- if .Values.prometheus.amp.proxyEnabled }}
         location /prometheus-amp/ {
-            proxy_pass {{ .Values.prometheus.amp.protocol }}://{{ .Values.prometheus.amp.service }}:{{ .Values.prometheus.amp.port }}/;
+            proxy_pass {{ .Values.prometheus.amp.protocol }}://{{tpl (.Values.prometheus.amp.service | default .Values.prometheus.amp.service) . }}:{{ .Values.prometheus.amp.port }}/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             add_header X-Frame-Options SAMEORIGIN;
         }{{end}}
         {{- range $siteid, $site := .Values.prometheus.site }}
         location /prometheus-{{$site.name}}/ {
-            proxy_pass {{ $site.protocol }}://{{ $site.service }}:{{ $site.port }}/;
+            proxy_pass {{ $site.protocol }}://{{ tpl $site.service $ }}:{{ $site.port }}/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             add_header X-Frame-Options SAMEORIGIN;
@@ -63,7 +63,7 @@
         }
         {{- range $key, $value := .Values.aetherservices }}
         location /{{ $key }}/ {
-            proxy_pass {{ $value.protocol}}://{{$key}}:{{ $value.http }}/;
+            proxy_pass {{ $value.protocol}}://{{ tpl $value.service $ }}:{{ $value.http }}/;
             proxy_http_version 1.1;
             proxy_set_header Upgrade $http_upgrade;
             proxy_set_header Connection "Upgrade";
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
index a052116..7d59f9b 100644
--- a/aether-roc-gui/values.yaml
+++ b/aether-roc-gui/values.yaml
@@ -15,8 +15,6 @@
   pullSecrets: []
 
 imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: "aether-roc-gui-v2-1"
 
 ## Client service.
 service:
@@ -64,6 +62,7 @@
 
 aetherservices:
   aether-roc-api:
+    service: "{{ .Release.Name }}-aether-roc-api"
     http: 8181
     protocol: http
     streamTimeout: 3600
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 890fcd2..76e43fd 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -8,7 +8,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 2.1.32
+version: 2.1.33
 appVersion: v0.0.0
 keywords:
   - aether
@@ -21,19 +21,19 @@
   - name: onos-topo
     condition: import.onos-topo.enabled
     repository: https://charts.onosproject.org
-    version: 1.4.1
+    version: 1.4.5
   - name: onos-config
     condition: import.onos-config.enabled
     repository: https://charts.onosproject.org
-    version: 1.8.3
+    version: 1.8.5
   - name: onos-cli
     condition: import.onos-cli.enabled
     repository: https://charts.onosproject.org
-    version: 1.3.11
+    version: 1.3.13
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
-    version: 1.7.13
+    version: 1.7.14
   - name: aether-roc-gui-v2
     condition: import.aether-roc-gui.v2-0.enabled
     repository: https://charts.aetherproject.org
@@ -41,7 +41,7 @@
   - name: aether-roc-gui
     condition: import.aether-roc-gui.v2-1.enabled
     repository: "file://../aether-roc-gui"
-    version: 2.1.18
+    version: 2.1.19
     alias: aether-roc-gui-v2-1
   - name: sdcore-adapter-v2
     condition: import.sdcore-adapter.v2-0.enabled
@@ -56,7 +56,7 @@
   - name: sdcore-adapter
     condition: import.sdcore-adapter.v2-1.enabled
     repository: "file://../sdcore-adapter"
-    version: 2.1.3
+    version: 2.1.4
     alias: sdcore-adapter-v2-1
   - name: subscriber-proxy
     condition: import.subscriber-proxy.enabled
@@ -66,35 +66,35 @@
     alias: sdcore-test-dummy
     condition: import.sdcore-test-dummy.enabled
     repository: https://charts.bitnami.com/bitnami
-    version: 12.0.0
+    version: 13.2.0
   - name: grafana
     condition: import.grafana.enabled
     repository: https://grafana.github.io/helm-charts
-    version: 6.16.6
+    version: 6.49.0
   - name: prometheus
     condition: import.prometheus.amp.enabled
     repository: https://prometheus-community.github.io/helm-charts
-    version: 14.6.1
+    version: 19.3.0
     alias: prometheus-amp
   - name: prometheus
     condition: import.prometheus.acc.enabled
     repository: https://prometheus-community.github.io/helm-charts
-    version: 14.6.1
+    version: 19.3.0
     alias: prometheus-acc
   - name: prometheus
     condition: import.prometheus.ace.enabled
     repository: https://prometheus-community.github.io/helm-charts
-    version: 14.6.1
+    version: 19.3.0
     alias: prometheus-ace
   - name: prom-label-proxy
     condition: import.prom-label-proxy.amp.enabled
     repository: "file://../prom-label-proxy"
-    version: 0.1.2
+    version: 0.1.3
     alias: prom-label-proxy-amp
   - name: prom-label-proxy
     condition: import.prom-label-proxy.acc.enabled
     repository: "file://../prom-label-proxy"
-    version: 0.1.2
+    version: 0.1.3
     alias: prom-label-proxy-acc
   - name: aether-mock-exporter
     condition: import.aether-mock-exporter.enabled
diff --git a/aether-roc-umbrella/templates/_helpers.tpl b/aether-roc-umbrella/templates/_helpers.tpl
index 4f31a8b..2e936e8 100644
--- a/aether-roc-umbrella/templates/_helpers.tpl
+++ b/aether-roc-umbrella/templates/_helpers.tpl
@@ -78,4 +78,25 @@
 {{- else -}}
 {{- printf "%s-consensus-store" ( include "global.fullname" . ) -}}
 {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
+
+{{/*
+sdcore-test-dummy
+*/}}
+{{- define "sdcore-test-dummy.fullname" -}}
+{{- printf "%s-sdcore-test-dummy" .Release.Name -}}
+{{- end -}}
+
+{{/*
+sdcore-adapter-v2-0-addr
+*/}}
+{{- define "sdcore-adapter-v2-0-addr" -}}
+{{- printf "%s-sdcore-adapter-v2-0:5150" .Release.Name -}}
+{{- end -}}
+
+{{/*
+sdcore-adapter-v2-1-addr
+*/}}
+{{- define "sdcore-adapter-v2-1-addr" -}}
+{{- printf "%s-sdcore-adapter-v2-1:5150" .Release.Name -}}
+{{- end -}}
diff --git a/aether-roc-umbrella/templates/datasources-templated.yaml b/aether-roc-umbrella/templates/datasources-templated.yaml
index 1f507d9..0e03116 100644
--- a/aether-roc-umbrella/templates/datasources-templated.yaml
+++ b/aether-roc-umbrella/templates/datasources-templated.yaml
@@ -15,7 +15,7 @@
      datasources:
      {{- range .Values.grafana.source }}
      - name: datasource-{{ .name }}
-       url: {{ .protocol }}://{{ .service }}:{{ .port }}
+       url: {{ .protocol }}://{{ tpl .service $ }}:{{ .port }}
        type: prometheus
        access: proxy
        jsonData:
diff --git a/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
index 9d9d109..b827ab6 100644
--- a/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
+++ b/aether-roc-umbrella/templates/sdcore-test-dummy-config.yaml
@@ -5,7 +5,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-sdcore-test-dummy
+  name: {{ template "sdcore-test-dummy.fullname" . }}
   namespace: {{ .Release.Namespace }}
 data:
   sdcore-test-dummy.conf: |-
diff --git a/aether-roc-umbrella/templates/topo.yaml b/aether-roc-umbrella/templates/topo.yaml
index b9198e9..6dddb2e 100644
--- a/aether-roc-umbrella/templates/topo.yaml
+++ b/aether-roc-umbrella/templates/topo.yaml
@@ -31,7 +31,7 @@
     name: aether
   aspects:
     onos.topo.Configurable:
-      address: sdcore-adapter-v2-0:5150
+      address: {{ template "sdcore-adapter-v2-0-addr" $ }}
       version: 2.0.x
       type: aether
     onos.topo.Location:
@@ -55,7 +55,7 @@
     name: enterprise
   aspects:
     onos.topo.Configurable:
-      address: sdcore-adapter-v2-1:5150
+      address: {{ template "sdcore-adapter-v2-1-addr" $ }}
       version: 2.1.x
       type: aether
     onos.topo.Location:
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index a287b50..922387f 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -106,85 +106,73 @@
 
 # Aether ROC GUI
 aether-roc-gui-v2:
-  nameOverride: aether-roc-gui-v2
-  fullnameOverride: aether-roc-gui-v2
   grafana:
     proxyEnabled: true
-    service: aether-roc-umbrella-grafana # the grafana hostname - use FQDN for other namespaces
+    service: "{{ .Release.Name }}-grafana" # the grafana hostname - use FQDN for other namespaces
   prometheus:
     acc:
       proxyEnabled: true
-      service: prom-label-proxy-acc
+      service: "{{ .Release.Name }}-prom-label-proxy-acc"
       protocol: http
       port: 8080
     amp:
       proxyEnabled: true
-      service: prom-label-proxy-amp
+      service: "{{ .Release.Name }}-prom-label-proxy-amp"
       protocol: http
       port: 8080
     site:
       - name: ace1
-        service: aether-roc-umbrella-prometheus-ace-server
+        service: "{{ .Release.Name }}-prometheus-ace-server"
         protocol: http
         port: 80
 
 aether-roc-gui-v2-1:
-  nameOverride: aether-roc-gui-v2-1
-  fullnameOverride: aether-roc-gui-v2-1
   feature:
     aether: true
     sdnfabric: false
   grafana:
     proxyEnabled: true
-    service: aether-roc-umbrella-grafana # the grafana hostname - use FQDN for other namespaces
+    service: "{{ .Release.Name }}-grafana" # the grafana hostname - use FQDN for other namespaces
   prometheus:
     acc:
       proxyEnabled: true
-      service: prom-label-proxy-acc
+      service: "{{ .Release.Name }}-prom-label-proxy-acc"
       protocol: http
       port: 8080
     amp:
       proxyEnabled: true
-      service: prom-label-proxy-amp
+      service: "{{ .Release.Name }}-prom-label-proxy-amp"
       protocol: http
       port: 8080
     site:
       - name: ace1
-        service: aether-roc-umbrella-prometheus-ace-server
+        service: "{{ .Release.Name }}-prometheus-ace-server"
         protocol: http
         port: 80
 
 # SD-Core Adapter
 sdcore-adapter-v2-0:
-  fullnameOverride: sdcore-adapter-v2-0
   prometheusEnabled: false
   partialUpdateEnabled: true
 
 sdcore-adapter-v2-1:
-  fullnameOverride: sdcore-adapter-v2-1
   prometheusEnabled: false
   partialUpdateEnabled: true  
 
 # Subscriber Proxy
 subscriber-proxy:
-  nameOverride: subscriber-proxy
-  fullnameOverride: subscriber-proxy
   prometheusEnabled: false
 
 # Prom label Proxy
 prom-label-proxy-amp:
-  nameOverride: prom-label-proxy-amp
-  fullnameOverride: prom-label-proxy-amp
   prometheusEnabled: false
   config:
-    upstream: http://aether-roc-umbrella-prometheus-amp-server
+    upstream: "http://{{ .Release.Name }}-prometheus-amp-server"
 
 prom-label-proxy-acc:
-  nameOverride: prom-label-proxy-acc
-  fullnameOverride: prom-label-proxy-acc
   prometheusEnabled: false
   config:
-    upstream: http://aether-roc-umbrella-prometheus-acc-server
+    upstream: "http://{{ .Release.Name }}-prometheus-acc-server"
 
 grafana:
   sidecar:
@@ -199,23 +187,23 @@
   source:
   - name: acc
     protocol: http
-    service: aether-roc-umbrella-prometheus-acc-server
+    service: "{{ .Release.Name }}-prometheus-acc-server"
     port: 80
   - name: amp
     protocol: http
-    service: aether-roc-umbrella-prometheus-amp-server
+    service: "{{ .Release.Name }}-prometheus-amp-server"
     port: 80
   - name: acme-chicago
     protocol: http
-    service: aether-roc-umbrella-prometheus-ace-server
+    service: "{{ .Release.Name }}-prometheus-ace-server"
     port: 80
   - name: starbucks-newyork
     protocol: http
-    service: aether-roc-umbrella-prometheus-ace-server
+    service: "{{ .Release.Name }}-prometheus-ace-server"
     port: 80
   - name: starbucks-seattle
     protocol: http
-    service: aether-roc-umbrella-prometheus-ace-server
+    service: "{{ .Release.Name }}-prometheus-ace-server"
     port: 80
   grafana.ini:
     log:
@@ -260,11 +248,11 @@
       name: KeyCloak
 
 prometheus-acc:
-  pushgateway:
+  prometheus-pushgateway:
     enabled: false
-  nodeExporter:
+  prometheus-node-exporter:
     enabled: false
-  kubeStateMetrics:
+  kube-state-metrics:
     enabled: false
   alertmanager:
     enabled: false
@@ -324,11 +312,11 @@
                 - aether-mock-exporter:2112
 
 prometheus-amp:
-  pushgateway:
+  prometheus-pushgateway:
     enabled: false
-  nodeExporter:
+  prometheus-node-exporter:
     enabled: false
-  kubeStateMetrics:
+  kube-state-metrics:
     enabled: false
   alertmanager:
     enabled: false
@@ -342,11 +330,11 @@
                 - aether-mock-exporter:2112
 
 prometheus-ace:
-  pushgateway:
+  prometheus-pushgateway:
     enabled: false
-  nodeExporter:
+  prometheus-node-exporter:
     enabled: false
-  kubeStateMetrics:
+  kube-state-metrics:
     enabled: true
   alertmanager:
     enabled: false
@@ -362,14 +350,14 @@
           scrape_interval: 2s
           static_configs:
             - targets:
-                - aether-roc-umbrella-kube-state-metrics:8080
+                - kube-state-metrics:8080
 
 # SD-Core Test Dummy
 # proxy_pass has to be added or nginx will not log the $request_body
 sdcore-test-dummy:
   service:
     type: ClusterIP
-  existingServerBlockConfigmap: aether-roc-umbrella-sdcore-test-dummy
+  existingServerBlockConfigmap: "{{ .Release.Name }}-sdcore-test-dummy"
 
 # ONOS-CONFIG
 onos-config:
@@ -383,13 +371,13 @@
       endpoint: localhost
       port: 5152
     - name: aether-2-1
-      image: onosproject/aether-2.1.x:2.1.11-aether-2.1.x
+      image: onosproject/aether-2.1.x:2.1.14-aether-2.1.x
       endpoint: localhost
       port: 5153
 
   openpolicyagent:
-    enabled: true
-    regoConfigMap: aether-roc-umbrella-opa-rbac
+    enabled: false
+    regoConfigMap: opa-rbac
 
 enterprises:
   - id: starbucks
diff --git a/chronos-umbrella/Chart.yaml b/chronos-umbrella/Chart.yaml
index 8aae521..3a97649 100644
--- a/chronos-umbrella/Chart.yaml
+++ b/chronos-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Chronos Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.31
+version: 0.1.32
 appVersion: v0.0.0
 keywords:
   - aether
@@ -33,7 +33,7 @@
   - name: aether-enterprise-portal
     condition: import.aether-enterprise-portal.enabled
     repository: "file://../aether-enterprise-portal"
-    version: 0.1.1
+    version: 0.1.2
   - name: rasa-model-server
     condition: import.rasa.enabled
     repository: "file://../rasa-model-server"
diff --git a/fabric-umbrella/Chart.yaml b/fabric-umbrella/Chart.yaml
deleted file mode 100644
index 0f2f554..0000000
--- a/fabric-umbrella/Chart.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v2
-name: fabric-umbrella
-description: Fabric ROC Umbrella chart to deploy all Fabric ROC
-kubeVersion: ">=1.18.0"
-type: application
-version: 0.1.17
-appVersion: v0.0.0
-keywords:
-  - aether
-  - sdn
-home: https://opennetworking.org/sd-fabric/
-maintainers:
-  - name: Fabric Ops team
-    email: support@opennetworking.org
-dependencies:
-  - name: onos-topo
-    condition: import.onos-topo.enabled
-    repository: https://charts.onosproject.org
-    version: 1.3.5
-  - name: onos-config
-    condition: import.onos-config.enabled
-    repository: https://charts.onosproject.org
-    version: 1.7.9
-  - name: onos-cli
-    condition: import.onos-cli.enabled
-    repository: https://charts.onosproject.org
-    version: 1.3.2
-  - name: aether-roc-api
-    condition: import.fabric-roc-api.enabled
-    repository: "file://../aether-roc-api"
-    version: 1.7.13
-    alias: fabric-roc-api
-  - name: aether-roc-gui
-    condition: import.fabric-roc-gui.v0-1.enabled
-    repository: "file://../aether-roc-gui"
-    version: 2.1.18
-    alias: fabric-roc-gui
-  - name: nginx
-    alias: fabric-test-dummy
-    condition: import.fabric-test-dummy.enabled
-    repository: https://charts.bitnami.com/bitnami
-    version: 12.0.0
-  - name: prometheus
-    condition: import.prometheus.false.enabled
-    repository: https://prometheus-community.github.io/helm-charts
-    version: 14.6.1
-    alias: prometheus-fabric
-  - name: prom-label-proxy
-    condition: import.prom-label-proxy.fabric.enabled
-    repository: "file://../prom-label-proxy"
-    version: 0.1.2
-    alias: prom-label-proxy-fabric
-  - name: aether-mock-exporter
-    condition: import.fabric-mock-exporter.enabled
-    repository: "file://../aether-mock-exporter"
-    version: 0.2.1
-    alias: fabric-mock-exporter
diff --git a/fabric-umbrella/README.md b/fabric-umbrella/README.md
deleted file mode 100644
index 2899961..0000000
--- a/fabric-umbrella/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2022-present Intel Corporation
-
-SPDX-License-Identifier: Apache-2.0
--->
-
-## Fabric ROC Umbrella chart
-
-First add repos to your Helm client
-```
-stable       	https://charts.helm.sh/stable
-cord         	https://charts.opencord.org
-atomix       	https://charts.atomix.io
-onosproject  	https://charts.onosproject.org
-aether       	https://charts.aetherproject.org
-cetic        	https://cetic.github.io/helm-charts
-bitnami      	https://charts.bitnami.com/bitnami
-```
-
-Provides a [Helm] chart for deploying
-
-* fabric-roc-gui (2 versions)
-* fabric-roc-api 
-* onos-topo
-* onos-config
-* fabric-adapter (2 versions)
-* fabric-test-dummy
-* prometheus
-
-to [Kubernetes].
-> See the [documentation] for more info.
-
-## Config models
-The Fabric ROC Umbrella chart controls the Config Model Plugins that are enabled in `onos-config`
-Currently 2 versions of the `Aether` model are loaded:
-
-* fabric-0.1.x
-
-[Kubernetes]: https://kubernetes.io/
-[Helm]: https://helm.sh/
-[documentation]: https://docs.onosproject.org/developers/deploy_with_helm/
diff --git a/fabric-umbrella/templates/NOTES.txt b/fabric-umbrella/templates/NOTES.txt
deleted file mode 100644
index 99e18ea..0000000
--- a/fabric-umbrella/templates/NOTES.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-Thank you for installing {{ .Chart.Name }} Helm chart.
-
-Your release is named {{ .Release.Name }} in namespace {{.Release.Namespace}}.
-See https://docs.onosproject.org/developers/deploy_with_helm/
-
-To learn more about the release, try:
-  $ helm -n {{.Release.Namespace}} status {{ .Release.Name }}
-  $ helm -n {{.Release.Namespace}} get all {{ .Release.Name }}
-  $ watch kubectl -n {{.Release.Namespace}} get pods
-
-You can attach to:
-* Fabric CLI pod with
-$ kubectl -n {{.Release.Namespace}} exec -it deployment/onos-cli -- /bin/bash
-* Fabric Portal at http://<server_IP>:31194
-
-The fabric-roc-api is then available at http://<server_IP>:31194/aether-roc-api
diff --git a/fabric-umbrella/templates/_helpers.tpl b/fabric-umbrella/templates/_helpers.tpl
deleted file mode 100644
index aeef6e9..0000000
--- a/fabric-umbrella/templates/_helpers.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-SPDX-FileCopyrightText: 2022-present Intel Corporation
-SPDX-License-Identifier: Apache-2.0
-
-Expand the name of the chart.
-*/}}
-{{- define "global.name" -}}
-{{- default .Chart.Name .Values.global.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "global.fullname" -}}
-{{- if .Values.global.fullnameOverride -}}
-{{- .Values.global.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.global.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "global.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "global.labels" -}}
-helm.sh/chart: {{ include "global.chart" . }}
-{{ include "global.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "global.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "global.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-global consensus image name
-*/}}
-{{- define "global.store.consensus.imagename" -}}
-{{- if .Values.global.store.consensus.image.tag -}}
-{{- if .Values.global.store.consensus.image.registry -}}
-{{- printf "%s/" .Values.global.store.consensus.image.registry -}}
-{{- end -}}
-{{- printf "%s:" .Values.global.store.consensus.image.repository -}}
-{{- .Values.global.store.consensus.image.tag -}}
-{{- else -}}
-""
-{{- end -}}
-{{- end -}}
-
-{{/*
-global consensus store name
-*/}}
-{{- define "global.store.consensus.name" -}}
-{{- if .Values.global.store.consensus.name -}}
-{{- printf "%s" .Values.global.store.consensus.name -}}
-{{- else -}}
-{{- printf "%s-consensus-store" ( include "global.fullname" . ) -}}
-{{- end -}}
-{{- end -}}
\ No newline at end of file
diff --git a/fabric-umbrella/templates/opa-rbac-configmap.yaml b/fabric-umbrella/templates/opa-rbac-configmap.yaml
deleted file mode 100644
index fe7057c..0000000
--- a/fabric-umbrella/templates/opa-rbac-configmap.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{ if ".Values.onos-config.openpolicyagent.enabled" }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-opa-rbac
-  labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-data:
-{{ (.Files.Glob "files/opa-rbac/*.rego").AsConfig | indent 2 }}
-{{end}}
\ No newline at end of file
diff --git a/fabric-umbrella/templates/sdcore-test-dummy-config.yaml b/fabric-umbrella/templates/sdcore-test-dummy-config.yaml
deleted file mode 100644
index d5b94a0..0000000
--- a/fabric-umbrella/templates/sdcore-test-dummy-config.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Chart.Name }}-fabric-test-dummy
-  namespace: {{ .Release.Namespace }}
-data:
-  fabric-test-dummy.conf: |-
-    log_format client '$remote_addr - $remote_user $request_time $upstream_response_time '
-                      '[$time_local] "$request" $status $body_bytes_sent $request_body "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    server {
-      listen 0.0.0.0:8080;
-      default_type application/json;
-      access_log /opt/bitnami/nginx/logs/access.log client;
-
-      # You can provide a special subPath or the root
-      location = /v1/config {
-        root /;
-        proxy_pass http://127.0.0.1:8080/post_dummy;
-      }
-      location = /v1/config/policies {
-        root /;
-        proxy_pass http://127.0.0.1:8080/post_dummy;
-      }
-      location = /v1/config/imsis {
-        root /;
-        proxy_pass http://127.0.0.1:8080/post_dummy;
-      }
-      location /v1/config/5g {
-        rewrite ^/v1/config/5g/.* /v1/config/5g break;
-        proxy_pass http://127.0.0.1:8080/post_dummy;
-      }
-      location /api/subscriber {
-        rewrite ^/api/subscriber/.* /api/subscriber break;
-        proxy_pass http://127.0.0.1:8080/post_dummy;
-      }
-      location /onos/v1/network/configuration {
-        root /;
-        proxy_pass http://127.0.0.1:8080/post_dummy;
-      }
-      location = /post_dummy {
-        # turn off logging here to avoid double logging
-        access_log off;
-        return 200;
-      }
-      error_page  405     =200 $uri;
-    }
diff --git a/fabric-umbrella/templates/store.yaml b/fabric-umbrella/templates/store.yaml
deleted file mode 100644
index 8bd1180..0000000
--- a/fabric-umbrella/templates/store.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.global.store.consensus.enabled }}
-apiVersion: atomix.io/v2beta1
-kind: Store
-metadata:
-  name: {{ template "global.store.consensus.name" . }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  protocol:
-    apiVersion: storage.atomix.io/v2beta2
-    kind: MultiRaftProtocol
-    spec:
-      replicas: {{ .Values.global.store.consensus.replicas }}
-      groups: {{ .Values.global.store.consensus.partitions }}
-      {{- with .Values.global.store.consensus.raft }}
-      raft:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      image: {{ template "global.store.consensus.imagename" . }}
-      imagePullPolicy: {{ .Values.global.store.consensus.image.pullPolicy }}
-      {{- with .Values.global.store.consensus.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.global.store.consensus.securityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.global.store.consensus.persistence.storageClass }}
-      volumeClaimTemplate:
-        spec:
-          accessModes:
-          - ReadWriteOnce
-          storageClassName: {{ .Values.global.store.consensus.persistence.storageClass | quote }}
-          resources:
-            requests:
-              storage: {{ .Values.global.store.consensus.persistence.storageSize }}
-      {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/fabric-umbrella/tests/fabric-roc-umbrella.go b/fabric-umbrella/tests/fabric-roc-umbrella.go
deleted file mode 100644
index 9ff7511..0000000
--- a/fabric-umbrella/tests/fabric-roc-umbrella.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-FileCopyrightText: 2022-present Intel Corporation
-//
-// SPDX-License-Identifier: Apache-2.0
-
-package tests
-
-import (
-	"testing"
-	"time"
-
-	"github.com/onosproject/helmit/pkg/helm"
-	"github.com/onosproject/helmit/pkg/input"
-	"github.com/onosproject/helmit/pkg/test"
-	"github.com/stretchr/testify/assert"
-)
-
-const aetherCharts = "https://charts.aetherproject.org/"
-
-// FabricUmbrellaSuite is the fabric-umbrella chart test suite
-type FabricUmbrellaSuite struct {
-	test.Suite
-	c *input.Context
-}
-
-// SetupTestSuite sets up the fabric-umbrella test suite
-func (s *FabricUmbrellaSuite) SetupTestSuite(c *input.Context) error {
-	s.c = c
-	return nil
-}
-
-// TestInstall tests installing the fabric-umbrella chart
-func (s *FabricUmbrellaSuite) TestInstall(t *testing.T) {
-	registry := s.c.GetArg("registry").String("")
-
-	onos := helm.Chart("fabric-umbrella", aetherCharts).
-		Release("fabric-umbrella").
-		WithTimeout(15*time.Minute).
-		Set("import.fabric-roc-gui.v0-1.enabled", false).
-		Set("import.fabric-adapter.v0-1.enabled", false).
-		Set("import.onos-cli.enabled", false).
-		Set("import.prometheus.fabric.enabled", false).
-		Set("fabric-roc-gui.service.type", "NodePort").
-		Set("global.image.registry", registry)
-	assert.NoError(t, onos.Install(true))
-}
diff --git a/fabric-umbrella/values.yaml b/fabric-umbrella/values.yaml
deleted file mode 100644
index 9506164..0000000
--- a/fabric-umbrella/values.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Default values for all Aether Helm charts.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-global:
-  fullnameOverride: "onos"
-  nameOverride: ""
-  image:
-    registry: ""
-    tag: ""
-  store:
-    consensus:
-      enabled: true
-      name: ""
-      image:
-        registry: ""
-        repository: atomix/atomix-raft-storage-node
-        tag: ""
-        pullPolicy: IfNotPresent
-        pullSecrets: []
-      clusters: 1
-      replicas: 1
-      partitions: 1
-      raft: {}
-      persistence:
-        storageClass: ""
-        storageSize: 1Gi
-
-import:
-  onos-topo:
-    enabled: true
-  onos-config:
-    enabled: true
-  onos-cli:
-    enabled: true
-  fabric-roc-api:
-    enabled: true
-  fabric-roc-gui:
-    v0-1:
-      enabled: true
-  fabric-test-dummy:
-    enabled: false
-  prometheus:
-    fabric:
-      enabled: false # controls its plproxy too
-  prom-label-proxy:
-    fabric:
-      enabled: false
-  fabric-mock-exporter:
-    enabled: false
-
-# ONOS-TOPO
-onos-topo:
-  store:
-    consensus:
-      enabled: false
-
-# ONOS-CLI
-onos-cli: {}
-
-# Aether ROC API
-fabric-roc-api: {}
-
-fabric-roc-gui:
-  nameOverride: fabric-roc-gui
-  fullnameOverride: fabric-roc-gui
-  feature:
-    aether: false
-    sdnfabric: true
-
-# Prom label Proxy
-prom-label-proxy-fabric:
-  nameOverride: prom-label-proxy-fabric
-  fullnameOverride: prom-label-proxy-fabric
-  prometheusEnabled: false
-  config:
-    upstream: http://fabric-umbrella-prometheus-fabric-server
-
-prometheus-fabric:
-  pushgateway:
-    enabled: false
-  nodeExporter:
-    enabled: false
-  kubeStateMetrics:
-    enabled: false
-  alertmanager:
-    enabled: false
-  serverFiles:
-    prometheus.yml:
-      scrape_configs:
-        - job_name: aether-mock-exporter
-          scrape_interval: 2s
-          static_configs:
-            - targets:
-                - aether-mock-exporter:2112
-
-# Fabric Test Dummy
-# proxy_pass has to be added or nginx will not log the $request_body
-fabric-test-dummy:
-  service:
-    type: ClusterIP
-  existingServerBlockConfigmap: fabric-umbrella-fabric-test-dummy
-
-# ONOS-CONFIG
-onos-config:
-  store:
-    consensus:
-      enabled: false
-  modelPlugins:
-    - name: fabric-0-1
-      image: onosproject/sdn-fabric-0.1.x:0.1.7-sdn-fabric-0.1.x
-      endpoint: localhost
-      port: 5152
-
-  openpolicyagent:
-    enabled: false
-    regoConfigMap: fabric-umbrella-opa-rbac
-
-fabrics:
-  - id: mars
-    name: Mars Fabric
-    onos:
-      address: netcfg.onos.mars
-      port: 8080
-      username: onos
-      password: rocks
-  - id: venus
-    name: Venus Fabric
-    onos:
-      address: netcfg.onos.venus
-      port: 8080
-      username: onos
-      password: rocks
diff --git a/prom-label-proxy/Chart.yaml b/prom-label-proxy/Chart.yaml
index b73946a..d2ca80a 100644
--- a/prom-label-proxy/Chart.yaml
+++ b/prom-label-proxy/Chart.yaml
@@ -6,7 +6,7 @@
 name: prom-label-proxy
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: v0.3.6
 description: Prom Label Proxy
 keywords:
diff --git a/prom-label-proxy/templates/deployment.yaml b/prom-label-proxy/templates/deployment.yaml
index 8243616..790c07b 100644
--- a/prom-label-proxy/templates/deployment.yaml
+++ b/prom-label-proxy/templates/deployment.yaml
@@ -53,7 +53,7 @@
               [
               "-label={{ .Values.config.label }}",
               "-admingroup={{ .Values.config.admingroup }}",
-              "-upstream={{ .Values.config.upstream }}",
+              "-upstream={{ tpl .Values.config.upstream . }}",
               "-insecure-listen-address=0.0.0.0:{{ .Values.config.http.port }}",
               "-config_address=$(POD_IP):{{ .Values.config.gnmi.port }}",
               "-onos_config_url={{ .Values.config.onos_config_url }}",
diff --git a/sdcore-adapter/Chart.yaml b/sdcore-adapter/Chart.yaml
index 3a0f2b2..37a993b 100644
--- a/sdcore-adapter/Chart.yaml
+++ b/sdcore-adapter/Chart.yaml
@@ -7,7 +7,7 @@
 name: sdcore-adapter
 kubeVersion: ">=1.17.0"
 type: application
-version: 2.1.3
+version: 2.1.4
 appVersion: v2.1.0
 description: Aether SD-Core Adapter
 keywords:
diff --git a/sdcore-adapter/values.yaml b/sdcore-adapter/values.yaml
index 9dca43e..8f5cdb5 100644
--- a/sdcore-adapter/values.yaml
+++ b/sdcore-adapter/values.yaml
@@ -11,7 +11,7 @@
 
 image:
   repository: onosproject/sdcore-adapter
-  tag: v0.4.4
+  tag: v0.4.6
   pullPolicy: IfNotPresent
   pullSecrets: []