diff --git a/aether-enterprise-portal/Chart.yaml b/aether-enterprise-portal/Chart.yaml
index ffb8576..7126aad 100644
--- a/aether-enterprise-portal/Chart.yaml
+++ b/aether-enterprise-portal/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether Enterprise Portal
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.1.1
+version: 0.1.2
 appVersion: 0.1.1
 keywords:
   - aether
diff --git a/aether-enterprise-portal/templates/configmap.yaml b/aether-enterprise-portal/templates/configmap.yaml
index aa59c25..133fbd8 100644
--- a/aether-enterprise-portal/templates/configmap.yaml
+++ b/aether-enterprise-portal/templates/configmap.yaml
@@ -16,14 +16,6 @@
         listen {{.Values.Nginx.port}};
         ssl_certificate /usr/share/certs/aether-enterprise-portal.crt;
         ssl_certificate_key /usr/share/certs/aether-enterprise-portal.key;
-        {{- if .Values.websocket.proxyEnabled }}
-        location /ws {
-            proxy_pass {{ .Values.websocket.protocol }}://{{ .Values.websocket.service }}:{{ .Values.websocket.port }}/ws;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_set_header Host $host;
-        }{{end}}
         {{- if .Values.grafana.proxyEnabled }}
         location /grafana/ {
             proxy_pass {{ .Values.grafana.protocol }}://{{ .Values.grafana.service }}:{{ .Values.grafana.port }}/;
diff --git a/aether-enterprise-portal/values.yaml b/aether-enterprise-portal/values.yaml
index 845be6e..a30e578 100644
--- a/aether-enterprise-portal/values.yaml
+++ b/aether-enterprise-portal/values.yaml
@@ -76,12 +76,6 @@
   protocol: http
   port: 8025
 
-websocket:
-  proxyEnabled: false
-  service: aether-roc-websocket
-  protocol: http
-  port: 80
-
 grafana:
   proxyEnabled: false
   service: grafana
diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index a358211..bc1962d 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: 2.1.13
+version: 2.1.14
 appVersion: 2.0.0
 keywords:
   - aether
diff --git a/aether-roc-gui/templates/configmap.yaml b/aether-roc-gui/templates/configmap.yaml
index c76e135..4fdb450 100644
--- a/aether-roc-gui/templates/configmap.yaml
+++ b/aether-roc-gui/templates/configmap.yaml
@@ -16,14 +16,6 @@
         listen {{.Values.Nginx.port}};
         ssl_certificate /usr/share/certs/aether-roc-gui.crt;
         ssl_certificate_key /usr/share/certs/aether-roc-gui.key;
-        {{- if .Values.websocket.proxyEnabled }}
-        location /ws {
-            proxy_pass {{ .Values.websocket.protocol }}://{{ .Values.websocket.service }}:{{ .Values.websocket.port }}/ws;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_set_header Host $host;
-        }{{end}}
         {{- if .Values.grafana.proxyEnabled }}
         location /grafana/ {
             proxy_pass {{ .Values.grafana.protocol }}://{{ .Values.grafana.service }}:{{ .Values.grafana.port }}/;
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
index 76f3e44..e304c10 100644
--- a/aether-roc-gui/values.yaml
+++ b/aether-roc-gui/values.yaml
@@ -64,12 +64,6 @@
     protocol: http
     streamTimeout: 3600
 
-websocket:
-  proxyEnabled: false
-  service: aether-roc-websocket
-  protocol: http
-  port: 80
-
 grafana:
   proxyEnabled: false
   service: grafana
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 2da5f4d..54309ff 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.24
+version: 2.1.25
 appVersion: v0.0.0
 keywords:
   - aether
@@ -34,10 +34,6 @@
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
     version: 1.7.10
-  - name: aether-roc-websocket
-    condition: import.aether-roc-websocket.enabled
-    repository: "file://../aether-roc-websocket"
-    version: 1.2.0
   - name: aether-roc-gui-v2
     condition: import.aether-roc-gui.v2-0.enabled
     repository: https://charts.aetherproject.org
@@ -45,7 +41,7 @@
   - name: aether-roc-gui
     condition: import.aether-roc-gui.v2-1.enabled
     repository: "file://../aether-roc-gui"
-    version: 2.1.13
+    version: 2.1.14
     alias: aether-roc-gui-v2-1
   - name: sdcore-adapter-v2
     condition: import.sdcore-adapter.v2-0.enabled
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 7cdd677..7d7e2f8 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -40,8 +40,6 @@
     enabled: true
   aether-roc-api:
     enabled: true
-  aether-roc-websocket:
-    enabled: true
   aether-roc-gui:
     v2-0:
       enabled: false
@@ -94,8 +92,6 @@
 aether-roc-gui-v2:
   nameOverride: aether-roc-gui-v2
   fullnameOverride: aether-roc-gui-v2
-  websocket:
-    proxyEnabled: true
   grafana:
     proxyEnabled: true
     service: aether-roc-umbrella-grafana # the grafana hostname - use FQDN for other namespaces
@@ -119,8 +115,6 @@
 aether-roc-gui-v4:
   nameOverride: aether-roc-gui-v4
   fullnameOverride: aether-roc-gui-v4
-  websocket:
-    proxyEnabled: true
   grafana:
     proxyEnabled: true
     service: aether-roc-umbrella-grafana # the grafana hostname - use FQDN for other namespaces
@@ -255,7 +249,6 @@
     enabled: false
   alertmanager:
     configMapOverrideName: alertmanager
-    webhook_url: "http://aether-roc-websocket/webhook"
   serverFiles:
     alerting_rules.yml:
      groups:
diff --git a/aether-roc-websocket/.helmignore b/aether-roc-websocket/.helmignore
deleted file mode 100644
index b31d38d..0000000
--- a/aether-roc-websocket/.helmignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Open Networking Foundation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
diff --git a/aether-roc-websocket/Chart.yaml b/aether-roc-websocket/Chart.yaml
deleted file mode 100644
index b635d2d..0000000
--- a/aether-roc-websocket/Chart.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v2
-name: aether-roc-websocket
-description: Aether ROC Websocket
-kubeVersion: ">=1.15.0"
-type: application
-version: 1.2.0
-appVersion: v0.8.7
-keywords:
-  - aether
-  - alerts
-  - roc
-  - openapi3
-  - websocket
-home: https://www.opennetworking.org/aether/
-maintainers:
-  - name: Aether Ops team
-    email: support@opennetworking.org
diff --git a/aether-roc-websocket/README.md b/aether-roc-websocket/README.md
deleted file mode 100644
index 78c29a5..0000000
--- a/aether-roc-websocket/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: Apache-2.0
--->
-
-## Aether ROC WebSocket
-
-Provides a [Helm] chart for deploying µONOS Aether ROC WebSocket micro service on [Kubernetes].
-See the [documentation](https://docs.aetherproject.org/master/developer/roc.html) for more info.
diff --git a/aether-roc-websocket/files/certs/README.md b/aether-roc-websocket/files/certs/README.md
deleted file mode 100644
index 8ce01d2..0000000
--- a/aether-roc-websocket/files/certs/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: Apache-2.0
--->
-
-This folder contains self-signed certificates for use in testing. _DO NOT USE THESE
-CERTIFICATES IN PRODUCTION!_
-
-The certificates were generated with the
-https://github.com/onosproject/gnxi-simulators/blob/master/pkg/certs/generate_certs.sh 
-script as
-```bash
-generate-certs.sh aether-roc-websocket.opennetworking.org
-```
-
-In this folder they **must** be (re)named
-* tls.cacrt
-* tls.crt
-* tls.key
-
-Use
-```bash
-openssl x509 -in aether-roc-websocket/files/certs/tls.crt -text -noout
-```
-to verify the contents (especially the subject).
diff --git a/aether-roc-websocket/files/certs/tls.cacrt b/aether-roc-websocket/files/certs/tls.cacrt
deleted file mode 100644
index d4440bd..0000000
--- a/aether-roc-websocket/files/certs/tls.cacrt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDYDCCAkgCCQDe99fSN9qxSTANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFyazEMMAoGA1UECgwDT05G
-MRQwEgYDVQQLDAtFbmdpbmVlcmluZzEeMBwGA1UEAwwVY2Eub3Blbm5ldHdvcmtp
-bmcub3JnMB4XDTE5MDQxMTA5MDYxM1oXDTI5MDQwODA5MDYxM1owcjELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlNZW5sb1BhcmsxDDAKBgNVBAoM
-A09ORjEUMBIGA1UECwwLRW5naW5lZXJpbmcxHjAcBgNVBAMMFWNhLm9wZW5uZXR3
-b3JraW5nLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEg7CZR
-X8Y+syKHaQCh6mNIL1D065trwX8RnuKM2kBwSu034zefQAPloWugSoJgJnf5fe0j
-nUD8gN3Sm8XRhCkvf67pzfabgw4n8eJmHScyL/ugyExB6Kahwzn37bt3oT3gSqhr
-6PUznWJ8fvfVuCHZZkv/HPRp4eyAcGzbJ4TuB0go4s6VE0WU5OCxCSlAiK3lvpVr
-3DOLdYLVoCa5q8Ctl3wXDrfTLw5/Bpfrg9fF9ED2/YKIdV8KZ2ki/gwEOQqWcKp8
-0LkTlfOWsdGjp4opPuPT7njMBGXMJzJ8/J1e1aJvIsoB7n8XrfvkNiWL5U3fM4N7
-UZN9jfcl7ULmm7cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAIh6FjkQuTfXddmZY
-FYpoTen/VD5iu2Xxc1TexwmKeH+YtaKp1Zk8PTgbCtMEwEiyslfeHTMtODfnpUIk
-DwvtB4W0PAnreRsqh9MBzdU6YZmzGyZ92vSUB3yukkHaYzyjeKM0AwgVl9yRNEZw
-Y/OM070hJXXzJh3eJpLl9dlUbMKzaoAh2bZx6y3ZJIZFs/zrpGfg4lvBAvfO/59i
-mxJ9bQBSN3U2Hwp6ioOQzP0LpllfXtx9N5LanWpB0cu/HN9vAgtp3kRTBZD0M1XI
-Ctit8bXV7Mz+1iGqoyUhfCYcCSjuWTgAxzir+hrdn7uO67Hv4ndCoSj4SQaGka3W
-eEfVeA==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/aether-roc-websocket/files/certs/tls.crt b/aether-roc-websocket/files/certs/tls.crt
deleted file mode 100644
index fc229d1..0000000
--- a/aether-roc-websocket/files/certs/tls.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfjCCAmYCFErBGzsXHo1l8bmZRmDkF+h2bsdVMA0GCSqGSIb3DQEBCwUAMHIx
-CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
-CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
-cGVubmV0d29ya2luZy5vcmcwHhcNMjExMDExMTE0NDMxWhcNMzExMDA5MTE0NDMx
-WjCBhDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlNZW5sb1Bh
-cmsxDDAKBgNVBAoMA09ORjEUMBIGA1UECwwLRW5naW5lZXJpbmcxMDAuBgNVBAMM
-J2FldGhlci1yb2Mtd2Vic29ja2V0Lm9wZW5uZXR3b3JraW5nLm9yZzCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKldGZTEQHPWjchY4hOXueA9yJ1sU3jK
-3+j/P/DB4igYWYBcImnUGOXLo5nP/rZRCj7qj7W2UJgzxEAH3g5Q1+upsPIBygA1
-wCgmxvxmI7KHwQ8yl5RJSRo3OmRx7dObeuD3Ipr1X4SMSplPPIH0+9uh28FMUz98
-2ZwqU/OjPA8emPXNqvP06XCKmi/fs4kg9cIABxr42+8hOmevyNjzol9Dz1aC6TwD
-EYhRng2exl3n59XDzqmojiSk9KXzGlqzNzuDn+VAhYmL8B/vf+2bd1H5o/EyL/U4
-I7KKIjJfxN1ay7TrdZ7SUmKVBO+jHVNNYknqPYvcneTjVhuoQ0EnqhkCAwEAATAN
-BgkqhkiG9w0BAQsFAAOCAQEAFVc0nV9N4Grhmecu8b4s1pdQDVedaQoN2oSE1RVp
-T6sYZ7RzGS2pL2um2dl60nsk1kJ31ptWqpKI13GccJ0lCBDLRYRoqf1HyhzaZ5/o
-Htx1GTWuwuPljgc6lATJxq1Ss3PVv4UzfocO/JeoY2iBsBWb/TaPU7O+41bZovCs
-Ux7wcf2qruGeaCXnHSBDs4719k77YKEDYHlFD9VKpDWXv4kSXsUZwqGajW72bKvl
-wTwahAaqxvJVURViyhyXXExxQiG3AEUQLnhviUfzlRULj58MT9yi56aOOUFSts6k
-u2lzgGtlba6vSaW7gOjR7C/b0nRi+VZgIuhiJTRJihlbHQ==
------END CERTIFICATE-----
diff --git a/aether-roc-websocket/files/certs/tls.key b/aether-roc-websocket/files/certs/tls.key
deleted file mode 100644
index e9f8f78..0000000
--- a/aether-roc-websocket/files/certs/tls.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpXRmUxEBz1o3I
-WOITl7ngPcidbFN4yt/o/z/wweIoGFmAXCJp1Bjly6OZz/62UQo+6o+1tlCYM8RA
-B94OUNfrqbDyAcoANcAoJsb8ZiOyh8EPMpeUSUkaNzpkce3Tm3rg9yKa9V+EjEqZ
-TzyB9PvbodvBTFM/fNmcKlPzozwPHpj1zarz9Olwipov37OJIPXCAAca+NvvITpn
-r8jY86JfQ89Wguk8AxGIUZ4NnsZd5+fVw86pqI4kpPSl8xpaszc7g5/lQIWJi/Af
-73/tm3dR+aPxMi/1OCOyiiIyX8TdWsu063We0lJilQTvox1TTWJJ6j2L3J3k41Yb
-qENBJ6oZAgMBAAECggEAEBREr3kKXXULNPArVozbGs0C1N9J9XfdVjOVkHf3zrKx
-HJyir8VxL6/rsliq6Ag9nseKKUhL0odnpGSa0mUeesM7h15gHTD9M1KrJZ9U2EhH
-Lfgxp+RlSlXf91VRrPtf6SfNY0TUcrMXCgMZzYTCvJFbWbizVp210zu5iLIAq7am
-W6dtuUj85ZTK2MCuguBb4K9umtjg7KgE7QjEvm+bt+TKLK06O3A8Fu0J/J0yJjhn
-MijKzA+xhMp9D5L08Y1WG4vOssN2v9MwBAYKZ1B3V3SMLhY8sNs4en6mMoS2Bwxu
-NRMnqEfktIUUbuJekN8jc2IAJiilRsRddEX/IWaOAQKBgQDbWjDMM1m8W5kUCbQW
-xsJ7M7mZ6dPmROfdWCCpz3utOa0GRAU5rYLRHjL607d1C/UvARuEvJPdr6CiUjmI
-vqWe78cILiqPO5of4MrMi9oB0XkXLF0nj7ks+lKjFWbSKEeyBgq3hB8rosA66P2s
-H3XPb1gQNoiTN/GQDfGelIA2OQKBgQDFqN66BbMIRn53hTuwXLTu3nPhCvvTH3JT
-D31GExT1P+aFNL9lolA251ELAabarxN/NJs/cLj0aFgY+CMKop/rCrtuN9xhTxlm
-nte+RT9/i15qQ4oePYHfCDy8CoCenkMF3zUkADiqT9he4zqndkLdYsgDXAsTLOsE
-Ud79PegS4QKBgF9ekUTXNrbMZHvv1BrrA/eo/5NJtNWzM9Rq0pjCGxWvs+i7fkIb
-jHr7VFL15he/wTRUmPBXRTrnd0Hb2iP4L+4wdiq6V8q6sUIW7FWOoJSVzL4kjcP7
-mxlRJMi/L1tEJBfkxJgRm7PPKSDz2AcUDpbH5FP4Qd0wP5jQVzMJgc0RAoGABIk7
-k0lOMoJrpJKKLCH0hQbV4fQ+kznFheJ1HYaSlI5C3Au52LtA3AGy+m2vRpV9/Q1Y
-AryzgehjHS+UnkndIae9ZWoixJjsHE7I5LTyIBsyr32dTdRbhqLJwgb7rKg1IY1d
-ytW2dzId5Q+R6QXtwubhcDJMjsQZIKBAXc9t5AECgYA6RmxCc3EkShqndUDEgFqq
-l1hsKpWo0hkMI4m35aD78xFgoBvBRdD+VRh1RZu5+7E4xM1NsjY3uM98E8VxnseI
-Iz4Ps4XmLnNw5Zoy4RNTr9Py9VBD/ylaS5DgAU0nJ/7kIc8t+rCKImFqguNRadEM
-B46+YnE/fq+yDi6UDGjK0w==
------END PRIVATE KEY-----
diff --git a/aether-roc-websocket/templates/NOTES.txt b/aether-roc-websocket/templates/NOTES.txt
deleted file mode 100644
index 1df8129..0000000
--- a/aether-roc-websocket/templates/NOTES.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Open Networking Foundation
-#
-# 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 }}
-
-{{ .Release.Name }} forwards Prometheus alerts to listening Web Sockets (in browser sessions).
-
-If you are using KinD as a Kubernetes server you will have to add a "port-forward" to access the {{ .Release.Name }} e.g.
-$ kubectl -n {{.Release.Namespace}} port-forward service/{{ .Release.Name }} 8181
diff --git a/aether-roc-websocket/templates/_helpers.tpl b/aether-roc-websocket/templates/_helpers.tpl
deleted file mode 100644
index 2343c79..0000000
--- a/aether-roc-websocket/templates/_helpers.tpl
+++ /dev/null
@@ -1,55 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: Apache-2.0
-
-Expand the name of the chart.
-*/}}
-{{- define "aether-roc-websocket.name" -}}
-{{- default .Chart.Name .Values.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 "aether-roc-websocket.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.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 "aether-roc-websocket.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "aether-roc-websocket.labels" -}}
-helm.sh/chart: {{ include "aether-roc-websocket.chart" . }}
-{{ include "aether-roc-websocket.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "aether-roc-websocket.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "aether-roc-websocket.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
diff --git a/aether-roc-websocket/templates/configmap.yaml b/aether-roc-websocket/templates/configmap.yaml
deleted file mode 100644
index 4d9e79d..0000000
--- a/aether-roc-websocket/templates/configmap.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "aether-roc-websocket.fullname" . }}-config
-  labels:
-    app: {{ template "aether-roc-websocket.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-data:
-  logging.yaml: |-
-{{ toYaml .Values.logging | indent 4 }}
diff --git a/aether-roc-websocket/templates/deployment.yaml b/aether-roc-websocket/templates/deployment.yaml
deleted file mode 100644
index 92f72f2..0000000
--- a/aether-roc-websocket/templates/deployment.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "aether-roc-websocket.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "aether-roc-websocket.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      name: {{ template "aether-roc-websocket.fullname" . }}
-      app: aether
-      type: ws
-      resource: {{ template "aether-roc-websocket.fullname" . }}
-      {{- include "aether-roc-websocket.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        name: {{ template "aether-roc-websocket.fullname" . }}
-        app: aether
-        type: ws
-        resource: {{ template "aether-roc-websocket.fullname" . }}
-        {{- include "aether-roc-websocket.selectorLabels" . | nindent 8 }}
-    spec:
-      serviceAccountName: aether-roc-websocket
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-          args: []
-          ports:
-            - name: http
-              containerPort: {{ .Values.port }}
-          startupProbe:
-            tcpSocket:
-              port: {{ .Values.port }}
-            periodSeconds: 5
-            failureThreshold: 60
-          readinessProbe:
-            tcpSocket:
-              port: {{ .Values.port }}
-            initialDelaySeconds: 10
-            periodSeconds: 10
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.port }}
-            initialDelaySeconds: 10
-            periodSeconds: 10
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          securityContext: {}
-      volumes:
-        - name: secret
-          secret:
-            secretName: {{ template "aether-roc-websocket.fullname" . }}-secret
-        - name: config
-          configMap:
-            name: {{ template "aether-roc-websocket.fullname" . }}-config
-      {{- with .Values.nodeSelector }}
-    nodeSelector:
-      {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-    affinity:
-      {{- toYaml . | nindent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-    tolerations:
-      {{- toYaml . | nindent 8 }}
-    {{- end }}
diff --git a/aether-roc-websocket/templates/secret.yaml b/aether-roc-websocket/templates/secret.yaml
deleted file mode 100644
index 1690e6f..0000000
--- a/aether-roc-websocket/templates/secret.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "aether-roc-websocket.fullname" . }}-secret
-  labels:
-     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-     release: "{{ .Release.Name }}"
-     heritage: "{{ .Release.Service }}"
-data:
-  {{ $root := . }}
-  {{ range $path, $bytes := .Files.Glob "files/certs/tls.*" }}
-  {{ base $path }}: '{{ $root.Files.Get $path | b64enc }}'
-  {{ end }}
-type: Opaque
diff --git a/aether-roc-websocket/templates/service.yaml b/aether-roc-websocket/templates/service.yaml
deleted file mode 100644
index b1df42b..0000000
--- a/aether-roc-websocket/templates/service.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "aether-roc-websocket.fullname" . }}
-  labels:
-    app: {{ template "aether-roc-websocket.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "aether-roc-websocket.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    name: {{ template "aether-roc-websocket.fullname" . }}
-    app: aether
-    type: ws
-    resource: {{ template "aether-roc-websocket.fullname" . }}
-    {{- include "aether-roc-websocket.selectorLabels" . | nindent 4 }}
-  ports:
-    - name: webhook
-      port: 80
-      targetPort: {{ .Values.port }}
diff --git a/aether-roc-websocket/templates/serviceaccount.yaml b/aether-roc-websocket/templates/serviceaccount.yaml
deleted file mode 100644
index db9fa1a..0000000
--- a/aether-roc-websocket/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: aether-roc-websocket
-  namespace: {{ .Release.Namespace }}
diff --git a/aether-roc-websocket/values.yaml b/aether-roc-websocket/values.yaml
deleted file mode 100644
index cdd0b3f..0000000
--- a/aether-roc-websocket/values.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# Default values for aether-roc-websocket.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: onosproject/aether-roc-websocket
-  tag: v0.8.7
-  pullPolicy: IfNotPresent
-  pullSecrets: []
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: "aether-roc-websocket"
-
-# Enable by giving a value like http://k3u-keycloak:80/auth/realms/master
-# make sure this is reachable at http://k3u-keycloak:80/auth/realms/master/.well-known/openid-configuration
-openidc:
-  issuer:
-
-port: 8120
-
-service:
-  type: ClusterIP
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-logging:
-  loggers:
-    root:
-      level: info
-      output:
-        stdout:
-          sink: stdout
-  sinks:
-    stdout:
-      type: stdout
-      stdout: {}
diff --git a/fabric-umbrella/Chart.yaml b/fabric-umbrella/Chart.yaml
index bfa1723..be0fb54 100644
--- a/fabric-umbrella/Chart.yaml
+++ b/fabric-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Fabric ROC Umbrella chart to deploy all Fabric ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 0.1.8
+version: 0.1.9
 appVersion: v0.0.0
 keywords:
   - aether
@@ -37,7 +37,7 @@
   - name: aether-roc-gui
     condition: import.fabric-roc-gui.v0-1.enabled
     repository: "file://../aether-roc-gui"
-    version: 2.1.13
+    version: 2.1.14
     alias: fabric-roc-gui
   - name: fabric-adapter
     condition: import.fabric-adapter.v0-1.enabled