diff --git a/VERSION b/VERSION
index dc1e644..fd42787 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.0
+2.0.0-dev1
diff --git a/aether-roc-api/Chart.yaml b/aether-roc-api/Chart.yaml
index fc7d3bc..c9c85e8 100644
--- a/aether-roc-api/Chart.yaml
+++ b/aether-roc-api/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC API
 kubeVersion: ">=1.15.0"
 type: application
-version: 1.2.12
+version: 1.3.0
 appVersion: v0.8.14
 keywords:
   - aether
diff --git a/aether-roc-gui/.helmignore b/aether-roc-gui/.helmignore
deleted file mode 100644
index f7a328e..0000000
--- a/aether-roc-gui/.helmignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.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-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
deleted file mode 100644
index 0a0b605..0000000
--- a/aether-roc-gui/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v2
-name: aether-roc-gui
-description: Aether ROC Graphical User Interface
-kubeVersion: ">=1.15.0"
-type: application
-version: 3.0.29
-appVersion: 3.0.0
-keywords:
-  - aether
-  - config
-home: https://www.opennetworking.org/aether/
-maintainers:
-  - name: Aether Ops team
-    email: support@opennetworking.org
diff --git a/aether-roc-gui/README.md b/aether-roc-gui/README.md
deleted file mode 100644
index 34d463c..0000000
--- a/aether-roc-gui/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
--->
-
-## Aether ROC GUI Helm Chart
-
-Provides a [Helm] chart for deploying Aether ROC GUI on [Kubernetes].
diff --git a/aether-roc-gui/files/certs/README.md b/aether-roc-gui/files/certs/README.md
deleted file mode 100644
index 7e6e434..0000000
--- a/aether-roc-gui/files/certs/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.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/simulators/blob/master/pkg/certs/generate_certs.sh 
-script as
-```bash
-generate-certs.sh onos-config.opennetworking.org
-```
-
-In this folder they **must** be (re)named
-* tls.cacrt
-* tls.crt
-* tls.key
-
-Use
-```bash
-openssl x509 -in deployments/helm/onos-config/files/certs/tls.crt -text -noout
-```
-to verify the contents (especially the subject).
-
-There is another Cert for onos-config in test/certs but these were created with:
-```
-generate-certs.sh onos-config
-```
-and are left named onf.cacrt, onos-config.key and onos-config.crt
\ No newline at end of file
diff --git a/aether-roc-gui/files/certs/aether-roc-gui.crt b/aether-roc-gui/files/certs/aether-roc-gui.crt
deleted file mode 100644
index 90be6b9..0000000
--- a/aether-roc-gui/files/certs/aether-roc-gui.crt
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIUSsEbOxcejWXxuZlGYOQX6HZux1gwDQYJKoZIhvcNAQEL
-BQAwcjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRIwEAYDVQQHDAlNZW5sb1Bh
-cmsxDDAKBgNVBAoMA09ORjEUMBIGA1UECwwLRW5naW5lZXJpbmcxHjAcBgNVBAMM
-FWNhLm9wZW5uZXR3b3JraW5nLm9yZzAeFw0yMDA5MjExMDIwMzZaFw0zMDA5MTkx
-MDIwMzZaMGsxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVu
-bG9QYXJrMQwwCgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMRcwFQYD
-VQQDDA5hZXRoZXItcm9jLWd1aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAMWFBjPd37Kdj3HamDOiaFR0kHz5dRArxEflubl+E65HgxGEh6zq2WUZHtRO
-PL8Q/qoQ52IFADKzlGFAHJHDUesE6DRIsEyq/bEfwIuQtbBixYRL4h8BvcCZBf97
-KSHViezZBMEAyFfVrbrdQnUeuIKut8deJ559WYt8j/bNVHNLua+OJPHlKptmdpGY
-auNsKFF9G4Bnay7s9B4eYQKfOnxOLdpcshFXjZaZdFesp5MLHHURHgnuvUFYs9uX
-pegMXIgZvV8Mc443bF2QfRc1t4v7Bj3hNHwuKm1U86xMHs5sIvl3ruPuphhe4JFU
-OCJOmVJ+eGKm4rkiqsAsV2D9iiECAwEAAaOBxzCBxDCBjgYDVR0jBIGGMIGDoXak
-dDByMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
-azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEeMBwGA1UEAwwV
-Y2Eub3Blbm5ldHdvcmtpbmcub3JnggkA3vfX0jfasUkwCQYDVR0TBAIwADALBgNV
-HQ8EBAMCBPAwGQYDVR0RBBIwEIIOYWV0aGVyLXJvYy1ndWkwDQYJKoZIhvcNAQEL
-BQADggEBAIYqeb1s5vGdtJFVsUflxYOKHu9Ikj2tQ/zk+Q+VCchxm8NFo7sWQVwB
-94vccp9Lo5fw/3zYUa4Qc/TWaKC8KQrVpruY8SSkwqhtAbjHP4+SulxYmh8AKlEZ
-vM5K7d/f0Otn3tiwMihKf3YSlMqEdD86A+t79yqLuYSIz765eLfHmpyxLdrQCwEz
-YzQAW66VOrlx/J0Cv7S07of0/tjENuSiX0VTp5V+ThI8qtv0How+S1Jah/YtXf7B
-Az5eHcA/fwQ4sJuCHg+rPEnsRwL3CVbjYO2cVwRk+a/RgL549upBD/2e1/K+8n+h
-KN8Kga5HKpWtblEGWWVvNdc2Fm6vJS0=
------END CERTIFICATE-----
diff --git a/aether-roc-gui/files/certs/aether-roc-gui.key b/aether-roc-gui/files/certs/aether-roc-gui.key
deleted file mode 100644
index c8edc9e..0000000
--- a/aether-roc-gui/files/certs/aether-roc-gui.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFhQYz3d+ynY9x
-2pgzomhUdJB8+XUQK8RH5bm5fhOuR4MRhIes6tllGR7UTjy/EP6qEOdiBQAys5Rh
-QByRw1HrBOg0SLBMqv2xH8CLkLWwYsWES+IfAb3AmQX/eykh1Yns2QTBAMhX1a26
-3UJ1HriCrrfHXieefVmLfI/2zVRzS7mvjiTx5SqbZnaRmGrjbChRfRuAZ2su7PQe
-HmECnzp8Ti3aXLIRV42WmXRXrKeTCxx1ER4J7r1BWLPbl6XoDFyIGb1fDHOON2xd
-kH0XNbeL+wY94TR8LiptVPOsTB7ObCL5d67j7qYYXuCRVDgiTplSfnhipuK5IqrA
-LFdg/YohAgMBAAECggEBALyxKAvEmj94ZeDOgzhQnnqQILhDV6HrLcfBnnumBgco
-Kf5CLZrzgFskdF89nqqpAaBWJbVuMZI+HDILnT9i6I8sUOghyMp1T4Y2Xyr1Q50N
-vsNz+sDEWRH1HdXDQrgf13N8nx4CMWI3r5Akb6iTgJDXeJntSMwP08t9Y8rSvSqm
-LoZqvJBSNOI0eUlJRjRA72JMGYndw3LlSKd5KdY1BTwQ7JrWtjpR2n4WZPSE9Rqq
-VwtbRaInFd5iMvRD15Kf+kp86ZDHGPD8Xr+iJIzraagVelXiE6YADnpArNl9fscm
-7vS2w0/Q+bxo+NK5wO7GW8CXhN1ePpfC1Q56hz5jSkECgYEA7qvAACZX1sMknhq2
-BWfW74+dNaerK+DRuH2zyg+010zF5dW8+6JhwwSiaDwpcKWFFemBOvESSmsgL4WU
-6q1EXo+0VrPlqbH0nHrLkgsklt+KH1yIaaaE5E2tK/gep1qdi9GIXscHSvGIfDw4
-50cdtTnBB+/52yBdc+hBu53fFEcCgYEA09xh/MbH/ZlptOIq4xrbzFaZdFA7s8FY
-jWsnl1gQarRyVET8ix6Fs7zg/MD9+V3KpbIm8dPrM4zqAQF02JP8vE7r1CFu+chJ
-Bz/+RuegYIMY5er6i1dhOZXxjFLZ8/+obISdod1cSxF/nqRSx5Bh+wgb8/5XV5Wf
-zilN5adWKlcCgYBfLJIV/TRN6edyPMiVA0GMqkJQoRn7F13KKiZFz1mX+X95FXCV
-D73YXMK+ui70Qqz9fe4QqQ1YK7vb93LY2ltHMhsB8B8HOnWG6NjA1jyzBVU5CFdF
-eifIOslxnTHsHpBwrw+oa8mWsxZwJDu0zoEkQXGeTq3eGdvqWpXL0TqiBQKBgDTZ
-GKhRfbnI9xFkCYa1QHbsc0MMcJgadthwDmQ2V4IGmS5kNwsNBhUb3JOwIKp/tvk2
-Q3i3gEhPsl+l2VvdLoJavYEhBenRCEaCtA9D4EGy8hcIUo9HsL0IpkR2tl+jOoQ3
-YIrsCQXAy7DrFKsrXQWdtDtdCrSSYlau/vt2jovpAoGAXc8a2A47boIFrC3RlLDx
-oPrAFPPt69TaZwuoYriF02/a965Zhgb2fRUUjjy5vTIolWCKQnfpc820umEVIqfb
-c46jacVkxqjQvoT6nUUnUjDsZFYq/M6mjWtBzVmKTitc1B1AZ0hLoUd9po5iuEWD
-bj7JUaqHjXzHcryPXTijqos=
------END PRIVATE KEY-----
diff --git a/aether-roc-gui/files/certs/tls.cacrt b/aether-roc-gui/files/certs/tls.cacrt
deleted file mode 100644
index d4440bd..0000000
--- a/aether-roc-gui/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-gui/files/certs/tls.crt b/aether-roc-gui/files/certs/tls.crt
deleted file mode 100644
index 2c7e2de..0000000
--- a/aether-roc-gui/files/certs/tls.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDcDCCAlgCFErBGzsXHo1l8bmZRmDkF+h2bsdTMA0GCSqGSIb3DQEBCwUAMHIx
-CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
-CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
-cGVubmV0d29ya2luZy5vcmcwHhcNMjAwNTA1MDc0MjEzWhcNMzAwNTAzMDc0MjEz
-WjB3MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
-azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEjMCEGA1UEAwwa
-Y2xpZW50MS5vcGVubmV0d29ya2luZy5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDK2amlhSGecWBI9jlj3OvCoGMAlHXffwHAsHskE/bFkyRKeYs0
-MHlcNBXSjgADtHt7FpGJ7nbZsMdu0XkNOlN/X0i8FKU7X9DnOHbHhOitg469J89D
-8tHnN2wrTyGxY2Km95PxeCQ4NH7z4MSSbdFfFXnw9k+qr+e1owswloJsYo+eyP7h
-jy7QvR2sAX8CC6D0ZaVuqLGK5kHJUyMxifqMa4D4wD8zfzahcTe2QAeOxQwhsaK2
-pZ/09bI/KCj8vxbxG2nkcwUgjl0Lgh0g1BFNSu39v1DjsiFWrIxnj3CL2Ncu0ps0
-+dPSdpx90ImvjL4BRPz8V4iLPljmBmQfU2HpAgMBAAEwDQYJKoZIhvcNAQELBQAD
-ggEBADERPV5ykcjUaskgPHk081A0LmsKKL9AdqLfREreRIJgPg1T+ppE7PAf+i9m
-W6lojz+qCOkjd9d7Cd7wWRvrndRs6xt3HoIu3Z+knds/SC6emz/Rf+ZYsODNC3b3
-zv7agEeuD2M/Lq8pLfh9MsCxFmbz4JuiJ3kkT8zhiRAbUW6LkYFzdSeq6uUrhZPv
-C6VCZtHRQiEHE84Wwkxcz7shyknPwwDZxLoNeGjQPruESsY9Dyt96dz8yBQ6ukD1
-hPpnMDb+sksoX0ZOoEYpNdqDvZWa25n64LBBLuxbCuelSVUpsEdjRvh10znFY36x
-op/V1+9Wot9zMohw6bu5Aj9K6s8=
------END CERTIFICATE-----
diff --git a/aether-roc-gui/files/certs/tls.key b/aether-roc-gui/files/certs/tls.key
deleted file mode 100644
index ca49789..0000000
--- a/aether-roc-gui/files/certs/tls.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDK2amlhSGecWBI
-9jlj3OvCoGMAlHXffwHAsHskE/bFkyRKeYs0MHlcNBXSjgADtHt7FpGJ7nbZsMdu
-0XkNOlN/X0i8FKU7X9DnOHbHhOitg469J89D8tHnN2wrTyGxY2Km95PxeCQ4NH7z
-4MSSbdFfFXnw9k+qr+e1owswloJsYo+eyP7hjy7QvR2sAX8CC6D0ZaVuqLGK5kHJ
-UyMxifqMa4D4wD8zfzahcTe2QAeOxQwhsaK2pZ/09bI/KCj8vxbxG2nkcwUgjl0L
-gh0g1BFNSu39v1DjsiFWrIxnj3CL2Ncu0ps0+dPSdpx90ImvjL4BRPz8V4iLPljm
-BmQfU2HpAgMBAAECggEAVEd9Ca03m5nldEsA6zHVrmZu28XS94nQU5u/fezhgZMx
-59N597QQKDPnwTSIYwGwsCJfU5yFOssNAUj873cFTA1trd8yC2oy5G58Q0dAWR8o
-xgRtRAD2HwfS5GebSxVM3qxMhm3xNnzxJiiD44bHD6dfo7LixLsTHU9hjc1q4NaR
-BfJCl01f1EgEtPB4L7l3E1ivgy2OQ91gSJsIneA4RFLn5NbMac7ZWOTMGThjGFAw
-qR38Ua7TzQXL+qNzHU0JUOBg4smk5tzPxD8ik2p8VTc8WrPEBX129fn+JumhKoIC
-4LysZoazLhKem56LBVSW/TNybXPy9z+nBhbFbnoLAQKBgQDpPfvc83f/f5Iu3PaG
-8BsIoOonasqGsFoDB7XN/DZdjk8d9MKF+2tK8tRtwfZ+cWJL7m94ZCudtU72uhwN
-0x1E/p+qAUBvE3WR3MxQQb6R5kyzMUlwTjwrM49kMuQdU7CaL2abqRvvekkE6L13
-9KesvE0TQSTx+beMbzUUdDyCCQKBgQDepInF/pmwbM0E2zKYny0Ro3caW6HoUEoJ
-ZGcZ/NLdTgiQ3GJsVddc0M4jgXMndjOJFZcDDeFPgRAgQVnJHbDDWNygmNDBKavj
-LNcTIB2AO4ObWIH2C6x38V6l+62Nc9QPlI52tiekWVO1tAhy3FJXRHAUhP43bi36
-VnCg0mJY4QKBgFuSTEnpBJm4+imP8vHzXom6s3OaR70ti4lZA5XFiYqdjo5SQ/Ta
-Srt4LtKQrjfiSBdLm1QG7+DRCBlx5AXBduJZnVHff+6cEzKbH1P7G9ioNEC9/vkq
-nhDQA2HxYQHqk5FVPtGqSR9yQSy+O3TXBuWYYCJJFzoxMlDecFaBdCgRAoGBAIRc
-qZPOQyyB4nkKn8/ggfjEh+BhraXhZcKjsC/hALOU2r7UZqcleX2ynXq6UO2a9hR/
-g2HLdLHBdwbWEzzfq+DXCYNolmLgFVJfrBWwuBkuSJWoTssqMYS1OKHROGKqA96n
-YPLuZC7u9DdIKuWuWj2LcF6imkf19tunXBogOVvBAoGBAJvIYUGba3WU+/Ugs3yZ
-ubNBC52mS2kLrOTZfzQOP6sL3OC5rFgm7A4e/CMCWphns98ftB0c1RaZBCcwskUE
-mCxUxvivP7oUNf0CMZd6CW2M0LEWMVrIFJ1o0BtNpUVZ/+nipJblRA1B/JLsgNvn
-11mpIWR4KHd8A5wjkkfb2d/e
------END PRIVATE KEY-----
diff --git a/aether-roc-gui/templates/NOTES.txt b/aether-roc-gui/templates/NOTES.txt
deleted file mode 100644
index 78b6e46..0000000
--- a/aether-roc-gui/templates/NOTES.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.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 }} depends on the "aether-roc-api which in turn depends
-on onos-config(with the Aether x.y.0 model plugins) and onos-topo"
-micro services.
-
-If you are using KinD as a Kubernetes server you will have to add a "port-forward" to access the aether-roc-gui e.g.
-$ kubectl -n {{.Release.Namespace}} port-forward $(kubectl -n {{.Release.Namespace}} get pods -l type=arg -o name) 8183:80
-and then access the API with:
-
-http://localhost:8183
diff --git a/aether-roc-gui/templates/_helpers.tpl b/aether-roc-gui/templates/_helpers.tpl
deleted file mode 100644
index 8dd6a8c..0000000
--- a/aether-roc-gui/templates/_helpers.tpl
+++ /dev/null
@@ -1,66 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-Expand the name of the chart.
-*/}}
-{{- define "aether-roc-gui.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-gui.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-gui.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Common labels
-*/}}
-{{- define "aether-roc-gui.labels" -}}
-helm.sh/chart: {{ include "aether-roc-gui.chart" . }}
-{{ include "aether-roc-gui.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-gui.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "aether-roc-gui.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "aether-roc-gui.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create -}}
-    {{ default (include "aether-roc-gui.fullname" .) .Values.serviceAccount.name }}
-{{- else -}}
-    {{ default "default" .Values.serviceAccount.name }}
-{{- end -}}
-{{- end -}}
diff --git a/aether-roc-gui/templates/configmap.yaml b/aether-roc-gui/templates/configmap.yaml
deleted file mode 100644
index 4646f9c..0000000
--- a/aether-roc-gui/templates/configmap.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "aether-roc-gui.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-  server-block.conf: |-
-    server {
-        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 }}/;
-            proxy_http_version 1.1;
-            proxy_redirect off;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $http_host;
-            proxy_set_header X-NginX-Proxy true;
-            proxy_hide_header 'X-Frame-Options';
-            add_header X-Frame-Options SAMEORIGIN;
-        }{{end}}
-        {{- if .Values.prometheus.proxyEnabled }}
-        location /prometheus/ {
-            proxy_pass {{ .Values.prometheus.protocol }}://{{ .Values.prometheus.service }}:{{ .Values.prometheus.port }}/;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            add_header X-Frame-Options SAMEORIGIN;
-        }{{end}}
-        location / {
-          root /usr/share/nginx/html;
-        }
-        location /rs/nav/uiextensions {
-          root /usr/share/nginx/html;
-        }
-        location /kubernetes-api/ {
-            proxy_pass http://localhost:8001/;
-            proxy_http_version 1.1;
-        }
-        {{- range $key, $value := .Values.aetherservices }}
-        location /{{ $key }}/ {
-            proxy_pass {{ $value.protocol}}://{{$key}}:{{ $value.http }}/;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
-            proxy_connect_timeout       {{ $value.streamTimeout }};
-            proxy_send_timeout          {{ $value.streamTimeout }};
-            proxy_read_timeout          {{ $value.streamTimeout }};
-            send_timeout                {{ $value.streamTimeout }};
-        }
-        {{ end }}
-    }
-
diff --git a/aether-roc-gui/templates/deployment.yaml b/aether-roc-gui/templates/deployment.yaml
deleted file mode 100644
index cbb2601..0000000
--- a/aether-roc-gui/templates/deployment.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "aether-roc-gui.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    {{- include "aether-roc-gui.labels" . | nindent 4 }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      name: {{ template "aether-roc-gui.fullname" . }}
-      app: aether
-      type: arg
-      resource: {{ template "aether-roc-gui.fullname" . }}
-      {{- include "aether-roc-gui.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        name: {{ template "aether-roc-gui.fullname" . }}
-        app: aether
-        type: arg
-        resource: {{ template "aether-roc-gui.fullname" . }}
-        {{- include "aether-roc-gui.selectorLabels" . | nindent 8 }}
-    spec:
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-    {{- end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: OPENIDCISSUER
-              value: {{ .Values.openidc.issuer }}
-          stdin : true
-          resources:
-            {{- toYaml .Values.resources | nindent 12 }}
-          ports:
-            {{- with .Values.ports }}
-            {{- range $key, $port := . }}
-            - name: {{ $key }}
-              {{ toYaml $port | nindent 14 }}
-            {{- end }}
-            {{- end }}
-          livenessProbe:
-            tcpSocket:
-              port: web
-            initialDelaySeconds: 30
-          readinessProbe:
-            tcpSocket:
-              port: web
-            initialDelaySeconds: 30
-          volumeMounts:
-            - name: config
-              mountPath: /etc/nginx/conf.d
-            - name: secret
-              mountPath: /usr/share/certs
-              readOnly: true
-
-      volumes:
-        - name: config
-          configMap:
-            name: {{ template "aether-roc-gui.fullname" . }}
-        - name: secret
-          secret:
-            secretName: {{ template "aether-roc-gui.fullname" . }}-secret
-      {{- 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-gui/templates/ingress.yaml b/aether-roc-gui/templates/ingress.yaml
deleted file mode 100644
index 986342e..0000000
--- a/aether-roc-gui/templates/ingress.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-{{- if .Values.ingress.enabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ template "aether-roc-gui.fullname" . }}-ingress
-  namespace: {{ .Release.Namespace }}
-  labels:
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-  annotations:
-    kubernetes.io/ingress.class: "nginx"
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
-spec:
-  tls:
-    - secretName: {{ template "aether-roc-gui.fullname" . }}-secret
-      hosts:
-        - aether-roc-gui.onosproject.org
-  rules:
-    - host: aether-roc-gui.onosproject.org
-      http:
-        paths:
-          - pathType: Prefix
-            path: "/"
-            backend:
-              service:
-                name: {{ template "aether-roc-gui.fullname" . }}
-                port:
-                  number: {{ .Values.ports.web.containerPort }}
-{{- end }}
diff --git a/aether-roc-gui/templates/role.yaml b/aether-roc-gui/templates/role.yaml
deleted file mode 100644
index 1780115..0000000
--- a/aether-roc-gui/templates/role.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  namespace: {{ .Release.Namespace }}
-  name: {{ template "aether-roc-gui.fullname" . }}-service-role
-rules:
-  - apiGroups: [""] # "" indicates the core API group
-    resources: ["services"]
-    verbs: ["get", "watch", "list"]
diff --git a/aether-roc-gui/templates/rolebinding.yaml b/aether-roc-gui/templates/rolebinding.yaml
deleted file mode 100644
index 45b5ec1..0000000
--- a/aether-roc-gui/templates/rolebinding.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: {{ template "aether-roc-gui.fullname" . }}-access-services
-  namespace: {{ .Release.Namespace }}
-subjects:
-  - kind: ServiceAccount
-    name: default # Name is case sensitive
-    namespace: {{ .Release.Namespace }}
-roleRef:
-  kind: Role
-  name: {{ template "aether-roc-gui.fullname" . }}-service-role
-  apiGroup: rbac.authorization.k8s.io
diff --git a/aether-roc-gui/templates/secret.yaml b/aether-roc-gui/templates/secret.yaml
deleted file mode 100644
index c047eed..0000000
--- a/aether-roc-gui/templates/secret.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "aether-roc-gui.fullname" . }}-secret
-  labels:
-     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-     release: "{{ .Release.Name }}"
-     heritage: "{{ .Release.Service }}"
-data:
-  {{ $root := . }}
-  {{ range $path, $bytes := .Files.Glob "files/certs/*.*" }}
-  {{ base $path }}: '{{ $root.Files.Get $path | b64enc }}'
-  {{ end }}
-type: Opaque
diff --git a/aether-roc-gui/templates/service.yaml b/aether-roc-gui/templates/service.yaml
deleted file mode 100644
index 6faf652..0000000
--- a/aether-roc-gui/templates/service.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "aether-roc-gui.fullname" . }}
-  labels:
-    app: {{ template "aether-roc-gui.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "aether-roc-gui.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    name: {{ template "aether-roc-gui.fullname" . }}
-    app: aether
-    type: arg
-    resource: {{ template "aether-roc-gui.fullname" . }}
-    {{- include "aether-roc-gui.selectorLabels" . | nindent 4 }}
-  ports:
-    - name: web
-      port: 80
----
-{{- if .Values.service.external.nodePort }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "aether-roc-gui.fullname" . }}-external
-  labels:
-    app: {{ template "aether-roc-gui.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "aether-roc-gui.labels" . | nindent 4 }}
-spec:
-  type: NodePort
-  selector:
-    name: {{ template "aether-roc-gui.fullname" . }}
-    app: aether
-    type: arg
-    resource: {{ template "aether-roc-gui.fullname" . }}
-    {{- include "aether-roc-gui.selectorLabels" . | nindent 4 }}
-  ports:
-    - name: web
-      port: 80
-      nodePort: {{ .Values.service.external.nodePort }}
-      protocol: TCP
-{{- end }}
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
deleted file mode 100644
index 7c51288..0000000
--- a/aether-roc-gui/values.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-# Default values for aether-roc-gui.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: onosproject/aether-roc-gui
-  tag: v0.7.29
-  pullPolicy: IfNotPresent
-  pullSecrets: []
-
-imagePullSecrets: []
-nameOverride: ""
-fullnameOverride: "aether-roc-gui"
-
-## Client service.
-service:
-  enabled: true
-  ## Service name is user-configurable for maximum service discovery flexibility.
-  name: aether-roc-gui
-  type: LoadBalancer
-  external:
-    nodePort: 31190
-
-ingress:
-  enabled: true
-
-ports:
-  web:
-    containerPort: 80
-    protocol: TCP
-
-# Enable by giving a value like http://dex-ldap-umbrella:5556
-# make sure this is reachable at http://dex-ldap-umbrella:5556/.well-known/openid-configuration
-openidc:
-  issuer:
-
-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: {}
-
-aetherservices:
-  aether-roc-api:
-    http: 8181
-    protocol: http
-    streamTimeout: 3600
-
-websocket:
-  proxyEnabled: false
-  service: aether-roc-websocket
-  protocol: http
-  port: 80
-
-grafana:
-  proxyEnabled: false
-  service: grafana
-  protocol: http
-  port: 80
-
-prometheus:
-  proxyEnabled: false
-  service: prometheus
-  protocol: http
-  port: 80
-
-Nginx:
-  port: 80
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index c237c7f..fe2e942 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.64
+version: 2.0.0
 appVersion: v0.0.0
 keywords:
   - aether
@@ -21,10 +21,6 @@
     condition: import.onos-topo.enabled
     repository: https://charts.onosproject.org
     version: 1.1.109
-  - name: config-model-aether-3
-    condition: onos-config.models.aether.v3.enabled
-    repository: "file://../config-models/aether-3.x"
-    version: 3.0.15
   - name: config-model-aether-4
     condition: onos-config.models.aether.v4.enabled
     repository: "file://../config-models/aether-4.x"
@@ -49,23 +45,15 @@
   - name: aether-roc-api
     condition: import.aether-roc-api.enabled
     repository: "file://../aether-roc-api"
-    version: 1.2.12
+    version: 1.3.0
   - name: aether-roc-websocket
     condition: import.aether-roc-websocket.enabled
     repository: "file://../aether-roc-websocket"
-    version: 1.0.1
-  - name: aether-roc-gui
-    condition: import.aether-roc-gui.v3.enabled
-    repository: "file://../aether-roc-gui"
-    version: 3.0.29
+    version: 1.1.0
   - name: aether-roc-gui-v4
     condition: import.aether-roc-gui.v4.enabled
     repository: "file://../aether-roc-gui-v4"
     version: 4.0.14
-  - name: sdcore-adapter
-    condition: import.sdcore-adapter.v3.enabled
-    repository: "file://../sdcore-adapter"
-    version: 3.0.16
   - name: sdcore-adapter-v4
     condition: import.sdcore-adapter.v4.enabled
     repository: "file://../sdcore-adapter-v4"
@@ -73,7 +61,7 @@
   - name: subscriber-proxy
     condition: import.subscriber-proxy.enabled
     repository: "file://../subscriber-proxy"
-    version: 0.0.6
+    version: 0.1.0
   - name: nginx
     alias: sdcore-test-dummy
     condition: import.sdcore-test-dummy.enabled
@@ -101,14 +89,14 @@
   - name: prom-label-proxy
     condition: import.prom-label-proxy.amp.enabled
     repository: "file://../prom-label-proxy"
-    version: 0.0.2
+    version: 0.1.0
     alias: prom-label-proxy-amp
   - name: prom-label-proxy
     condition: import.prom-label-proxy.acc.enabled
     repository: "file://../prom-label-proxy"
-    version: 0.0.2
+    version: 0.1.0
     alias: prom-label-proxy-acc
   - name: demo-exporter
     condition: import.demo-exporter.enabled
     repository: "file://../demo-exporter"
-    version: 0.0.1
+    version: 0.1.0
diff --git a/aether-roc-websocket/Chart.yaml b/aether-roc-websocket/Chart.yaml
index 81d5422..24401c9 100644
--- a/aether-roc-websocket/Chart.yaml
+++ b/aether-roc-websocket/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Websocket
 kubeVersion: ">=1.15.0"
 type: application
-version: 1.0.1
+version: 1.1.0
 appVersion: v0.8.7
 keywords:
   - aether
diff --git a/demo-exporter/Chart.yaml b/demo-exporter/Chart.yaml
index a88ef1a..b6fc6d9 100644
--- a/demo-exporter/Chart.yaml
+++ b/demo-exporter/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Demo Exporter
 kubeVersion: ">=1.15.0"
 type: application
-version: 0.0.1
+version: 0.1.0
 appVersion: v0.0.0
 keywords:
   - aether
diff --git a/prom-label-proxy/Chart.yaml b/prom-label-proxy/Chart.yaml
index 3f57db5..7277789 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.0.2
+version: 0.1.0
 appVersion: v0.3.4
 description: Prom Label Proxy
 keywords:
diff --git a/sdcore-adapter/.helmignore b/sdcore-adapter/.helmignore
deleted file mode 100644
index 01d4cd9..0000000
--- a/sdcore-adapter/.helmignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# SPDX-FileCopyrightText: 2021 Open Networking Foundation
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.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
diff --git a/sdcore-adapter/Chart.yaml b/sdcore-adapter/Chart.yaml
deleted file mode 100644
index 2f81200..0000000
--- a/sdcore-adapter/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v2
-name: sdcore-adapter
-kubeVersion: ">=1.17.0"
-type: application
-version: 3.0.16
-appVersion: v3.0.0
-description: ONOS SD-Core Adapter
-keywords:
-  - onos
-  - sdn
-home: https://onosproject.org
-maintainers:
-  - name: ONOS Support
-    email: support@opennetworking.org
diff --git a/sdcore-adapter/README.md b/sdcore-adapter/README.md
deleted file mode 100644
index c589608..0000000
--- a/sdcore-adapter/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
--->
-
-## ONOS SD-Core Adapter
-
-Provides a [Helm] chart for deploying µONOS SD-Core adapter on [Kubernetes].
diff --git a/sdcore-adapter/files/certs/README.md b/sdcore-adapter/files/certs/README.md
deleted file mode 100644
index ae3f841..0000000
--- a/sdcore-adapter/files/certs/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.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/simulators/blob/master/pkg/certs/generate_certs.sh 
-script as
-```bash
-generate_certs.sh sdcore-adapter
-```
-
-In this folder they **must** be (re)named
-* tls.cacrt
-* tls.crt
-* tls.key
-
-Use
-```bash
-openssl x509 -in deployments/helm/onos-config/files/certs/tls.crt -text -noout
-```
-to verify the contents (especially the subject).
-
-There is another Cert for onos-config in test/certs but these were created with:
-```
-generate-certs.sh onos-config
-```
-and are left named onf.cacrt, onos-config.key and onos-config.crt
\ No newline at end of file
diff --git a/sdcore-adapter/files/certs/tls.cacert b/sdcore-adapter/files/certs/tls.cacert
deleted file mode 100644
index 879bc06..0000000
--- a/sdcore-adapter/files/certs/tls.cacert
+++ /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-----
diff --git a/sdcore-adapter/files/certs/tls.crt b/sdcore-adapter/files/certs/tls.crt
deleted file mode 100644
index c724912..0000000
--- a/sdcore-adapter/files/certs/tls.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDZDCCAkwCFErBGzsXHo1l8bmZRmDkF+h2bsdWMA0GCSqGSIb3DQEBCwUAMHIx
-CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
-CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
-cGVubmV0d29ya2luZy5vcmcwHhcNMjAwOTIxMjAyNzM3WhcNMzAwOTE5MjAyNzM3
-WjBrMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
-azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEXMBUGA1UEAwwO
-c2Rjb3JlLWFkYXB0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3
-w6n5TzQ3Mx6T7q9WCxEsqpWja9EOV+4GrHLJU/DiIbNTBb7zchOZ56uXoZwpVSeu
-mGz+teCE59S55Iwmx6RJ3Hwqxv+ZVN93sYf7E+91I2ccRj4GvJHz4cVifgug0aG4
-CpqWeBP96Xa0fIJnw6s3sslG27N+KO3Qv5o+V1cz0P3mnYePt+PzTUyKVM5mEsH9
-RjzGSJRuIpB388K+2XW+tMAdB+0IpszKXrUH5bIWCbi/hYMDXI7Gs7TtNQw7ZkIn
-sUQ8FYgJQI1F1hVAsFjsKsN0/resy+YG80ClMV2lXKCr/jUOv0PWwOKwt8TYKDNX
-g4qxn6V/zUGqSttW1KhZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABXfT9THxoEF
-nHfN+7wAJSh/BGvGcDj/aqMSFItWU8L5meixgZMwdLhjBbjpkSaY5xWw/MMSsXEA
-pemjCvuOO/gD9/HNr1e1xh112O9a2QDRtv5WgAx/ugYeV/wGOxQZROzMFVpAzSUU
-yQO5iGPGGaVOZJ6E1iOSP5SJn2XWjOBQEcmUAV8DtdRzsOWRda/YDdqX6KDULwl9
-hym9r96skzS/jMejV/MYaxgaVB5Xqr6k3JT23msBpkzUIzlO0rMOiJ98h36zqynQ
-HnPtpaZ45VgBxNlU39T81C1UjKhw1HTWEuPX5bJyGnNAdKBfHfQVJrdnJYTCZfYZ
-9CeRFCy3P84=
------END CERTIFICATE-----
diff --git a/sdcore-adapter/files/certs/tls.key b/sdcore-adapter/files/certs/tls.key
deleted file mode 100644
index 58b76b7..0000000
--- a/sdcore-adapter/files/certs/tls.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3w6n5TzQ3Mx6T
-7q9WCxEsqpWja9EOV+4GrHLJU/DiIbNTBb7zchOZ56uXoZwpVSeumGz+teCE59S5
-5Iwmx6RJ3Hwqxv+ZVN93sYf7E+91I2ccRj4GvJHz4cVifgug0aG4CpqWeBP96Xa0
-fIJnw6s3sslG27N+KO3Qv5o+V1cz0P3mnYePt+PzTUyKVM5mEsH9RjzGSJRuIpB3
-88K+2XW+tMAdB+0IpszKXrUH5bIWCbi/hYMDXI7Gs7TtNQw7ZkInsUQ8FYgJQI1F
-1hVAsFjsKsN0/resy+YG80ClMV2lXKCr/jUOv0PWwOKwt8TYKDNXg4qxn6V/zUGq
-SttW1KhZAgMBAAECggEAcxbbHGYriKq+at3g+B2ESxonD6uVycruK0XTuh2VTrrW
-iZeeqO94MTqz8ApqOES5zpJuKPQVwodDZo0p7Zu5W/z30v7A0/Ig5uDMDkbFAPME
-P+QKMsPlEP4EVhQlCjpgc1hIyxY3Rx3xl0Ynkf8s+3xArN0qREgz8Toeyw5+cddR
-DM7kh9rdq9euA7lnoyiTP8UgSDzMrzLnGj8CbJHcKLzNwA2zwSJtBhdLoWbYCyCD
-JLPFGsuIHV2kuvHpmOxxS+vypT9bETxf60yevug+ay7K7Bgt+amX30RU/SFkF6Aa
-JJYaMf2VAdg6O1g5jNXZ4KuWvRUFt6jxjOg8MI87tQKBgQDmjZTD3mogD5LbT8uv
-sMe9QMp/xGvRiAiOkalpDrsF9zgob0fH9nTf1o767OjYJwRmBE1vQPRd/KFNJQ/d
-zulyR5rdWKoLen/q+fYJSdf1gl7ZDomFSr1IVBksab4ifQ9bSBn6d2n5PKenlW9M
-aJMj5izeskuRlCsjkBsuU+voowKBgQDMDAnCnxOdI/ryY6wx5WXsMPh0RLkcXPnq
-d00iVjKNhrpBVwvh8VGAuUfpGoEmI2I3WWwrmAp6t8LrdHPQlQDS/dlmY1+CarF7
-soCpw8UjhKiB18jUPewaYNbr5olVdYC/Nt70JJwxvQZNCnCwCfJpgkG83UtXSFsA
-WKILTFkO0wKBgQDEowy24gPxxFak5rH67vPs3k3YG1c6JqPltSagjAfHVst28TJv
-wix8nSrlqRoPAXgm6pSAxw2k+8s3WNzneYpyBdB36R9fGuPvLbJCydB/fOoYhuWT
-4eL+xXuS/b1E/RUT7bL6hM7F3I3ByRpcOPUGMVMjvT3mtFD2y/ni0YDrsQKBgCBf
-sJS+ZIBEGyamBcYM3XTx+BmKZcxIPCalMwnFn1OxEpAXXX1Fqma//tbPK7p/Vq/t
-ciogf1klGrn8yftICM9xEzMZhSfOAcbcdWl59CdEfu/K6sQx5unwf2kCNLvoXrr3
-27vkqxuBICTNCUAE8/8leYSbn76DblzJszwTqvWdAoGBAKscYUC9wyrcersVHFmD
-L8sba/8alQ/orX9/Ex3Fyhe8Hn4877znq2Cixnd6zA13o0mJIMRtKOX3CC6XG1WI
-eC0WgAUnbdWlgIyrAnyYQytSWEItJH7nBIOcB7BvkqVHd1/y0/OMgeDiBI7/mHb9
-EZHA1SMvz1yEKUm53DyCh8Nj
------END PRIVATE KEY-----
diff --git a/sdcore-adapter/files/configs/README.md b/sdcore-adapter/files/configs/README.md
deleted file mode 100644
index cade213..0000000
--- a/sdcore-adapter/files/configs/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
--->
-
-This folder contains test configurations that are loaded into the application
-via a `ConfigMap` when deploying via this Helm chart. The root test configurations
-are copied here because Helm does not allow files outside the chart to be accessed
-via templates. Changes to the root test configurations should be reflected here.
diff --git a/sdcore-adapter/files/configs/empty_config.json b/sdcore-adapter/files/configs/empty_config.json
deleted file mode 100644
index 2c63c08..0000000
--- a/sdcore-adapter/files/configs/empty_config.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/sdcore-adapter/files/configs/typical_aether_config.json b/sdcore-adapter/files/configs/typical_aether_config.json
deleted file mode 100644
index 3353206..0000000
--- a/sdcore-adapter/files/configs/typical_aether_config.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "access-profile": {
-    "access-profile": [
-      {
-        "id": "typical-access-profile",
-        "type": "internet-only",
-        "filter": "allow app name",
-        "description": "a typical access profile"
-      }
-    ]
-  },  
-  "apn-profile": {
-    "apn-profile": [
-      {
-        "id": "typical-apn-profile",
-        "apn-name": "internet",
-        "dns-primary": "8.8.8.4",
-        "dns-secondary": "8.8.8.8",
-        "mtu": 1460,
-        "gx-enabled": true,
-        "description": "a typical apn profile"
-      }
-    ]
-  },
-  "qos-profile": {
-    "qos-profile": [
-      {
-        "id": "typical-qos-profile",
-        "apn-ambr": {
-          "uplink": 4096,
-          "downlink": 4096
-        },
-        "description": "a typical qos profile"
-      }
-    ]
-  },
-  "up-profile": {
-    "up-profile": [
-      {
-        "id": "typical-up-profile",
-        "user-plane": "spgwu1.headless",
-        "access-control": "all",
-        "description": "a typical up profile"
-      }
-    ]
-  },    
-  "subscriber": {
-    "ue": [
-      {
-        "ueid": "e150109999111",
-        "serving-plmn": {
-          "mcc": 208,
-          "mnc": 11,
-          "tac": 1
-        },
-        "enabled": true,
-        "requested-apn": "mme-selected-apn",
-        "profiles": {
-          "apn-profile": "typical-apn-profile",
-          "qos-profile": "typical-qos-profile",
-          "up-profile": "typical-up-profile",
-          "access-profile": [
-            {
-              "access-profile": "typical-access-profile",
-              "allowed": true
-            }
-          ]
-        }
-      }
-    ]
-  }
-}
diff --git a/sdcore-adapter/templates/_helpers.tpl b/sdcore-adapter/templates/_helpers.tpl
deleted file mode 100644
index e7d9bab..0000000
--- a/sdcore-adapter/templates/_helpers.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-Expand the name of the chart.
-*/}}
-{{- define "sdcore-adapter.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 "sdcore-adapter.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 "sdcore-adapter.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{/*
-Common labels
-*/}}
-{{- define "sdcore-adapter.labels" -}}
-helm.sh/chart: {{ include "sdcore-adapter.chart" . }}
-{{ include "sdcore-adapter.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "sdcore-adapter.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "sdcore-adapter.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
diff --git a/sdcore-adapter/templates/configmap.yaml b/sdcore-adapter/templates/configmap.yaml
deleted file mode 100644
index 057871f..0000000
--- a/sdcore-adapter/templates/configmap.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "sdcore-adapter.fullname" . }}-targetconfig
-  labels:
-    app: {{ template "sdcore-adapter.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-data:
-  {{ $root := . }}
-  {{ range $path, $bytes := .Files.Glob "files/configs/*.json" }}
-  {{ base $path }}: '{{ $root.Files.Get $path }}'
-  {{ end }}
-
----
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "sdcore-adapter.fullname" . }}-logconfig
-  labels:
-    app: {{ template "sdcore-adapter.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-data:
-  logging.yaml: |-
-{{ toYaml .Values.logging | indent 4 }}
diff --git a/sdcore-adapter/templates/deployment.yaml b/sdcore-adapter/templates/deployment.yaml
deleted file mode 100644
index e381db6..0000000
--- a/sdcore-adapter/templates/deployment.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "sdcore-adapter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    name: {{ template "sdcore-adapter.fullname" . }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "sdcore-adapter.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        name: {{ template "sdcore-adapter.fullname" . }}
-        {{- include "sdcore-adapter.selectorLabels" . | nindent 8 }}
-    spec:
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 6 }}
-    {{- end }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          args:
-            - "/usr/local/bin/sdcore-adapter"
-            - "-bind_address=:{{ .Values.ports.gnmi.secure }}"
-            - "-key=/etc/sdcore-adapter/certs/tls.key"
-            - "-cert=/etc/sdcore-adapter/certs/tls.crt"
-            - "-ca=/etc/sdcore-adapter/certs/tls.cacert"
-            - "-alsologtostderr"
-            - "-hostCheckDisabled"
-            - "-model_version={{ .Values.model.version }}"
-            {{ if .Values.initialConfig }}
-            - "-config={{ .Values.initialConfig }}"
-            {{ end }}
-            {{ if .Values.output }}
-            - "-output={{ .Values.output }}"
-            {{ end }}
-            {{ if .Values.spgwEndpoint }}
-            - "-spgw_endpoint={{ .Values.spgwEndpoint }}"
-            {{ end }}
-          ports:
-            {{- range $key, $port := .Values.ports.gnmi }}
-            - name: gnmi{{ $key }}
-              containerPort: {{ $port }}
-            {{- end}}
-          readinessProbe:
-            tcpSocket:
-              port: {{ .Values.ports.gnmi.secure }}
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.ports.gnmi.secure }}
-            initialDelaySeconds: 15
-            periodSeconds: 20
-          volumeMounts:
-            - name: targetconfig
-              mountPath: /etc/sdcore-adapter/configs
-              readOnly: true
-            - name: secret
-              mountPath: /etc/sdcore-adapter/certs
-              readOnly: true              
-            - name: logconfig
-              mountPath: /etc/onos/config
-              readOnly: true
-        - name: {{ .Chart.Name }}-exporter
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          env:
-            - name: POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: NODE_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: spec.nodeName
-          args:
-            - "/usr/local/bin/sdcore-exporter"
-          ports:
-            - name: metrics
-              containerPort: 2112
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 2112
-            initialDelaySeconds: 5
-            periodSeconds: 10
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 2112
-            initialDelaySeconds: 15
-            periodSeconds: 20
-      volumes:
-        - name: logconfig
-          configMap:
-            name: {{ template "sdcore-adapter.fullname" . }}-logconfig
-        - name: targetconfig
-          configMap:
-            name: {{ template "sdcore-adapter.fullname" . }}-targetconfig            
-        - name: secret
-          secret:
-            secretName: {{ template "sdcore-adapter.fullname" . }}-secret
diff --git a/sdcore-adapter/templates/secret.yaml b/sdcore-adapter/templates/secret.yaml
deleted file mode 100644
index f54e403..0000000
--- a/sdcore-adapter/templates/secret.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "sdcore-adapter.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/sdcore-adapter/templates/service.yaml b/sdcore-adapter/templates/service.yaml
deleted file mode 100644
index a266be4..0000000
--- a/sdcore-adapter/templates/service.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "sdcore-adapter.fullname" . }}
-  labels:
-    app: {{ template "sdcore-adapter.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "sdcore-adapter.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    name: {{ template "sdcore-adapter.fullname" . }}
-  ports:
-    {{- range $key, $port := .Values.ports.gnmi }}
-    - name: gnmi{{ $key }}
-      port: {{ $port }}
-    {{- end}}
-    - name: prometheus
-      port: {{ .Values.ports.prometheus }}
-    - name: diag-api
-      port: {{ .Values.ports.diagApi }}
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "sdcore-adapter.fullname" . }}-exporter
-  labels:
-    app: {{ template "sdcore-adapter.fullname" . }}-exporter
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "sdcore-adapter.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    name: {{ template "sdcore-adapter.fullname" . }}
-  ports:
-  - name: metrics
-    port: 2112
-  - name: exporterui
-    port: 8081
diff --git a/sdcore-adapter/templates/servicemonitor.yaml b/sdcore-adapter/templates/servicemonitor.yaml
deleted file mode 100644
index f3d9c89..0000000
--- a/sdcore-adapter/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-{{- if eq .Values.prometheusEnabled true }}
-
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: sdcore-adapter
-  labels:
-    {{- include "sdcore-adapter.labels" . | nindent 4 }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "sdcore-adapter.selectorLabels" . | nindent 6 }}
-  endpoints:
-  - port: prometheus
-    path: /metrics
-    scheme: HTTP
-{{ end }}
diff --git a/sdcore-adapter/values.yaml b/sdcore-adapter/values.yaml
deleted file mode 100644
index 816c5ad..0000000
--- a/sdcore-adapter/values.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-
-nameOverride: ""
-fullnameOverride: ""
-
-replicaCount: 1
-annotations: {}
-
-image:
-  repository: onosproject/sdcore-adapter
-  tag: v0.1.39
-  pullPolicy: IfNotPresent
-  pullSecrets: []
-
-resources:
-  requests:
-    cpu: 0.5
-    memory: 512Mi
-
-service:
-  type: ClusterIP
-
-model:
-  version: v3
-
-secure: true
-initialConfig: ""
-output: ""
-spgwEndpoint: ""
-
-ports:
-  gnmi:
-    secure: 5150
-  prometheus: 9851
-  diagApi: 8080
-
-prometheusEnabled: true
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-logging:
-  loggers:
-    root:
-      level: info
-      output:
-        stdout:
-          sink: stdout
-  sinks:
-    stdout:
-      type: stdout
-      stdout: {}
diff --git a/subscriber-proxy/Chart.yaml b/subscriber-proxy/Chart.yaml
index 5eda5df..9389526 100644
--- a/subscriber-proxy/Chart.yaml
+++ b/subscriber-proxy/Chart.yaml
@@ -6,7 +6,7 @@
 name: subscriber-proxy
 kubeVersion: ">=1.17.0"
 type: application
-version: 0.0.6
+version: 0.1.0
 appVersion: v0.2.18
 description: Subscriber-Proxy
 keywords: