diff --git a/fabric-adapter/.helmignore b/fabric-adapter/.helmignore
deleted file mode 100644
index 4b27f6c..0000000
--- a/fabric-adapter/.helmignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# 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
diff --git a/fabric-adapter/Chart.yaml b/fabric-adapter/Chart.yaml
deleted file mode 100644
index e2b9da1..0000000
--- a/fabric-adapter/Chart.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v2
-name: fabric-adapter
-kubeVersion: ">=1.17.0"
-type: application
-version: 0.1.3
-appVersion: v0.0.5
-description: Aether Fabric Adapter
-keywords:
-  - aether
-  - fabric
-  - adapter
-home: https://www.opennetworking.org/aether/
-maintainers:
-  - name: Intel
-    email: scott.baker@intel.com
diff --git a/fabric-adapter/README.md b/fabric-adapter/README.md
deleted file mode 100644
index d5022ac..0000000
--- a/fabric-adapter/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2021 Open Networking Foundation
-
-SPDX-License-Identifier: Apache-2.0
--->
-
-## ONOS Fabric Adapter
-
-Provides a [Helm] chart for deploying µONOS Fabric adapter on [Kubernetes].
diff --git a/fabric-adapter/files/certs/README.md b/fabric-adapter/files/certs/README.md
deleted file mode 100644
index fce60c2..0000000
--- a/fabric-adapter/files/certs/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-SPDX-FileCopyrightText: 2022-present Intel Corporation
-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/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/fabric-adapter/files/certs/tls.cacert b/fabric-adapter/files/certs/tls.cacert
deleted file mode 100644
index 879bc06..0000000
--- a/fabric-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/fabric-adapter/files/certs/tls.crt b/fabric-adapter/files/certs/tls.crt
deleted file mode 100644
index c724912..0000000
--- a/fabric-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/fabric-adapter/files/certs/tls.key b/fabric-adapter/files/certs/tls.key
deleted file mode 100644
index 58b76b7..0000000
--- a/fabric-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/fabric-adapter/templates/_helpers.tpl b/fabric-adapter/templates/_helpers.tpl
deleted file mode 100644
index ef34f5a..0000000
--- a/fabric-adapter/templates/_helpers.tpl
+++ /dev/null
@@ -1,89 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-SPDX-FileCopyrightText: 2022-present Intel Corporation
-SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-SPDX-License-Identifier: Apache-2.0
-
-Expand the name of the chart.
-*/}}
-{{- define "fabric-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 "fabric-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 "fabric-adapter.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-
-{{/*
-Common labels
-*/}}
-{{- define "fabric-adapter.labels" -}}
-helm.sh/chart: {{ include "fabric-adapter.chart" . }}
-{{ include "fabric-adapter.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end -}}
-
-{{/*
-Selector labels
-*/}}
-{{- define "fabric-adapter.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "fabric-adapter.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-fabric-adapter consensus image name
-*/}}
-{{- define "fabric-adapter.store.consensus.imagename" -}}
-{{- if or .Values.store.consensus.image.tag .Values.global.store.consensus.image.tag -}}
-{{- if .Values.global.store.consensus.image.registry -}}
-{{- printf "%s/" .Values.global.store.consensus.image.registry -}}
-{{- else if .Values.store.consensus.image.registry -}}
-{{- printf "%s/" .Values.store.consensus.image.registry -}}
-{{- end -}}
-{{- printf "%s:" .Values.store.consensus.image.repository -}}
-{{- if .Values.global.store.consensus.image.tag -}}
-{{- .Values.global.store.consensus.image.tag -}}
-{{- else -}}
-{{- .Values.store.consensus.image.tag -}}
-{{- end -}}
-{{- else -}}
-""
-{{- end -}}
-{{- end -}}
-
-{{/*
-fabric-adapter consensus store name
-*/}}
-{{- define "fabric-adapter.store.consensus.name" -}}
-{{- if .Values.store.consensus.name -}}
-{{- printf "%s" .Values.store.consensus.name -}}
-{{- else -}}
-{{- printf "%s-consensus-store" ( include "fabric-adapter.fullname" . ) -}}
-{{- end -}}
-{{- end -}}
diff --git a/fabric-adapter/templates/configmap.yaml b/fabric-adapter/templates/configmap.yaml
deleted file mode 100644
index 74912b8..0000000
--- a/fabric-adapter/templates/configmap.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "fabric-adapter.fullname" . }}-logconfig
-  labels:
-    app: {{ template "fabric-adapter.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-data:
-  logging.yaml: |-
-{{ toYaml .Values.logging | indent 4 }}
diff --git a/fabric-adapter/templates/deployment.yaml b/fabric-adapter/templates/deployment.yaml
deleted file mode 100644
index b05418e..0000000
--- a/fabric-adapter/templates/deployment.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ template "fabric-adapter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-  labels:
-    name: {{ template "fabric-adapter.fullname" . }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      {{- include "fabric-adapter.selectorLabels" . | nindent 6 }}
-  template:
-    metadata:
-      labels:
-        name: {{ template "fabric-adapter.fullname" . }}
-        {{- include "fabric-adapter.selectorLabels" . | nindent 8 }}
-      annotations:
-        broker.atomix.io/inject: "true"
-        raft.storage.atomix.io/inject: "true"
-    spec:
-    {{- with .Values.imagePullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 6 }}
-    {{- end }}
-      serviceAccountName: {{ template "fabric-adapter.fullname" . }}
-      securityContext:
-        {{- toYaml .Values.podSecurityContext | nindent 8 }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ tpl .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/fabric-adapter"
-            - "-bind_address=:{{ .Values.ports.gnmi.secure }}"
-            - "-key=/etc/fabric-adapter/certs/tls.key"
-            - "-cert=/etc/fabric-adapter/certs/tls.crt"
-            - "-ca=/etc/fabric-adapter/certs/tls.cacert"
-            - "-alsologtostderr"
-            - "-hostCheckDisabled"
-            {{ if .Values.defaultTarget }}
-            - "-default_target={{ .Values.defaultTarget }}"
-            {{ end }}
-            {{ if not .Values.partialUpdateEnabled }}
-            - "-partial_update_disable"
-            {{ end }}
-            {{ if .Values.kafkaURI }}
-            - "-kafka_uri={{ .Values.kafkaURI }}"
-            {{ 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: secret
-              mountPath: /etc/fabric-adapter/certs
-              readOnly: true
-            - name: logconfig
-              mountPath: /etc/onos/config
-              readOnly: true
-      volumes:
-        - name: logconfig
-          configMap:
-            name: {{ template "fabric-adapter.fullname" . }}-logconfig
-        - name: secret
-          secret:
-            secretName: {{ template "fabric-adapter.fullname" . }}-secret
-        - name: config
-          configMap:
-            name: {{ template "fabric-adapter.fullname" . }}-config
diff --git a/fabric-adapter/templates/primitives.yaml b/fabric-adapter/templates/primitives.yaml
deleted file mode 100644
index d89fc1e..0000000
--- a/fabric-adapter/templates/primitives.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: primitives.atomix.io/v2beta1
-kind: Counter
-metadata:
-  name: fabric-adapter-sid-counter
-  namespace: {{ .Release.Namespace }}
-spec:
-  store:
-    {{- if .Values.global.store.consensus.enabled }}
-    name: {{ template "global.store.consensus.name" . }}
-    {{- else }}
-    name: {{ template "fabric-adapter.store.consensus.name" . }}
-    {{- end }}
----
-apiVersion: primitives.atomix.io/v2beta1
-kind: Map
-metadata:
-  name: fabric-adapter-sid-map
-  namespace: {{ .Release.Namespace }}
-spec:
-  store:
-    {{- if .Values.global.store.consensus.enabled }}
-    name: {{ template "global.store.consensus.name" . }}
-    {{- else }}
-    name: {{ template "fabric-adapter.store.consensus.name" . }}
-    {{- end }}
----
\ No newline at end of file
diff --git a/fabric-adapter/templates/role.yaml b/fabric-adapter/templates/role.yaml
deleted file mode 100644
index 4e04428..0000000
--- a/fabric-adapter/templates/role.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  creationTimestamp: null
-  name: {{ template "fabric-adapter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-rules:
-  - apiGroups:
-      - primitives.atomix.io
-    resources:
-      - '*'
-    resourceNames:
-      - fabric-adapter-sid-counter
-      - fabric-adapter-sid-map
-
-    verbs:
-      - '*'
\ No newline at end of file
diff --git a/fabric-adapter/templates/rolebinding.yaml b/fabric-adapter/templates/rolebinding.yaml
deleted file mode 100644
index a2d922a..0000000
--- a/fabric-adapter/templates/rolebinding.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: 2022 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: {{ template "fabric-adapter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
-subjects:
-- kind: ServiceAccount
-  name: {{ template "fabric-adapter.fullname" . }}
-roleRef:
-  kind: Role
-  name: {{ template "fabric-adapter.fullname" . }}
-  apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
diff --git a/fabric-adapter/templates/secret.yaml b/fabric-adapter/templates/secret.yaml
deleted file mode 100644
index 11ed1c1..0000000
--- a/fabric-adapter/templates/secret.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "fabric-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/fabric-adapter/templates/service.yaml b/fabric-adapter/templates/service.yaml
deleted file mode 100644
index 43c92ba..0000000
--- a/fabric-adapter/templates/service.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "fabric-adapter.fullname" . }}
-  labels:
-    app: {{ template "fabric-adapter.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    {{- include "fabric-adapter.labels" . | nindent 4 }}
-spec:
-  type: {{ .Values.service.type }}
-  selector:
-    name: {{ template "fabric-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 }}
diff --git a/fabric-adapter/templates/serviceaccount.yaml b/fabric-adapter/templates/serviceaccount.yaml
deleted file mode 100644
index e17f846..0000000
--- a/fabric-adapter/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-FileCopyrightText: 2022 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "fabric-adapter.fullname" . }}
-  namespace: {{ .Release.Namespace }}
\ No newline at end of file
diff --git a/fabric-adapter/templates/servicemonitor.yaml b/fabric-adapter/templates/servicemonitor.yaml
deleted file mode 100644
index 8f7f55d..0000000
--- a/fabric-adapter/templates/servicemonitor.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if eq .Values.prometheusEnabled true }}
-
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  name: fabric-adapter
-  labels:
-    {{- include "fabric-adapter.labels" . | nindent 4 }}
-spec:
-  selector:
-    matchLabels:
-      {{- include "fabric-adapter.selectorLabels" . | nindent 6 }}
-  endpoints:
-  - port: prometheus
-    path: /metrics
-    scheme: HTTP
-{{ end }}
diff --git a/fabric-adapter/templates/store.yaml b/fabric-adapter/templates/store.yaml
deleted file mode 100644
index 70e1b4d..0000000
--- a/fabric-adapter/templates/store.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# SPDX-FileCopyrightText: 2022 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.store.consensus.enabled }}
-apiVersion: atomix.io/v2beta1
-kind: Store
-metadata:
-  name: {{ template "fabric-adapter.store.consensus.name" . }}
-  namespace: {{ .Release.Namespace }}
-spec:
-  protocol:
-    apiVersion: storage.atomix.io/v2beta2
-    kind: MultiRaftProtocol
-    spec:
-      replicas: {{ .Values.store.consensus.replicas }}
-      groups: {{ .Values.store.consensus.partitions }}
-      {{- with .Values.store.consensus.raft }}
-      raft:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      image: {{ template "fabric-adapter.store.consensus.imagename" . }}
-      imagePullPolicy: {{ .Values.store.consensus.image.pullPolicy }}
-      {{- with .Values.store.consensus.image.pullSecrets }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.store.consensus.securityContext }}
-      securityContext:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- if .Values.store.consensus.persistence.storageClass }}
-      volumeClaimTemplate:
-        spec:
-          accessModes:
-          - ReadWriteOnce
-          storageClassName: {{ .Values.store.consensus.persistence.storageClass | quote }}
-          resources:
-            requests:
-              storage: {{ .Values.store.consensus.persistence.storageSize }}
-      {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/fabric-adapter/values.yaml b/fabric-adapter/values.yaml
deleted file mode 100644
index 971cc25..0000000
--- a/fabric-adapter/values.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-global:
-  store:
-    consensus:
-      name: ""
-      image:
-        registry: ""
-        tag: ""
-
-nameOverride: ""
-fullnameOverride: ""
-
-replicaCount: 1
-annotations: {}
-
-image:
-  repository: onosproject/fabric-adapter
-  tag: "{{ .Chart.AppVersion }}"
-  pullPolicy: IfNotPresent
-  pullSecrets: []
-
-resources:
-  requests:
-    cpu: 0.5
-    memory: 512Mi
-
-service:
-  type: ClusterIP
-
-partialUpdateEnabled: true
-secure: true
-
-ports:
-  gnmi:
-    secure: 5150
-  prometheus: 9851
-  diagApi: 8080
-
-kafkaURI: ""
-
-prometheusEnabled: true
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-logging:
-  loggers:
-    root:
-      level: info
-      output:
-        stdout:
-          sink: stdout
-  sinks:
-    stdout:
-      type: stdout
-      stdout: {}
-
-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
diff --git a/fabric-umbrella/Chart.yaml b/fabric-umbrella/Chart.yaml
index 323a667..0f2f554 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.16
+version: 0.1.17
 appVersion: v0.0.0
 keywords:
   - aether
@@ -37,13 +37,8 @@
   - name: aether-roc-gui
     condition: import.fabric-roc-gui.v0-1.enabled
     repository: "file://../aether-roc-gui"
-    version: 2.1.17
+    version: 2.1.18
     alias: fabric-roc-gui
-  - name: fabric-adapter
-    condition: import.fabric-adapter.v0-1.enabled
-    repository: "file://../fabric-adapter"
-    version: 0.1.3
-    alias: fabric-adapter-v0-1
   - name: nginx
     alias: fabric-test-dummy
     condition: import.fabric-test-dummy.enabled
diff --git a/fabric-umbrella/templates/topo.yaml b/fabric-umbrella/templates/topo.yaml
deleted file mode 100644
index a2ceb64..0000000
--- a/fabric-umbrella/templates/topo.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# SPDX-FileCopyrightText: 2022-present Intel Corporation
-#
-# SPDX-License-Identifier: Apache-2.0
-
-# A topology kind representing an Aether Enterprise node
-apiVersion: topo.onosproject.org/v1beta1
-kind: Kind
-metadata:
-  name: fabric
-spec:
-  aspects: {}
-
-# Fabrics as targets
-{{- range .Values.fabrics }}
----
-apiVersion: topo.onosproject.org/v1beta1
-kind: Entity
-metadata:
-  name: {{ .id }}
-spec:
-  uri: {{ .id }}
-  kind:
-    name: fabric
-  aspects:
-    onos.topo.Configurable:
-      address: fabric-adapter-v0-1:5150
-      version: 0.1.x
-      type: sdn-fabric
-    onos.topo.ControllerInfo:
-      control_endpoint:
-        address: {{ .onos.address }}
-        port: {{ .onos.port }}
-      username: {{ .onos.username }}
-      password: {{ .onos.password }}
-    onos.topo.Location:
-      lat: {{ .lat }}
-      lng: {{ .long }}
-    onos.topo.TLSOptions:
-      insecure: true
-    onos.topo.Asset:
-      name: {{ .name }}
-    onos.topo.MastershipState: {}
-{{- end }}
diff --git a/fabric-umbrella/values.yaml b/fabric-umbrella/values.yaml
index 4399aa3..9506164 100644
--- a/fabric-umbrella/values.yaml
+++ b/fabric-umbrella/values.yaml
@@ -42,9 +42,6 @@
   fabric-roc-gui:
     v0-1:
       enabled: true
-  fabric-adapter:
-    v0-1:
-      enabled: true
   fabric-test-dummy:
     enabled: false
   prometheus:
@@ -75,12 +72,6 @@
     aether: false
     sdnfabric: true
 
-# Fabric Adapter
-fabric-adapter-v0-1:
-  fullnameOverride: fabric-adapter-v0-1
-  prometheusEnabled: false
-  partialUpdateEnabled: true
-
 # Prom label Proxy
 prom-label-proxy-fabric:
   nameOverride: prom-label-proxy-fabric