diff --git a/subscriber-proxy/.helmignore b/subscriber-proxy/.helmignore
new file mode 100644
index 0000000..01d4cd9
--- /dev/null
+++ b/subscriber-proxy/.helmignore
@@ -0,0 +1,25 @@
+# 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/subscriber-proxy/Chart.yaml b/subscriber-proxy/Chart.yaml
new file mode 100644
index 0000000..69c6126
--- /dev/null
+++ b/subscriber-proxy/Chart.yaml
@@ -0,0 +1,18 @@
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: v2
+name: subscriber-proxy
+kubeVersion: ">=1.17.0"
+type: application
+version: 0.0.3
+appVersion: v0.1.32
+description: Subscriber-Proxy
+keywords:
+  - aether
+  - config
+home: https://onosproject.org
+maintainers:
+  - name: Aether Ops team
+    email: support@opennetworking.org
diff --git a/subscriber-proxy/README.md b/subscriber-proxy/README.md
new file mode 100644
index 0000000..0ce0da9
--- /dev/null
+++ b/subscriber-proxy/README.md
@@ -0,0 +1,10 @@
+<!--
+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 Subscriber Proxy on [Kubernetes].
+It helps to add IMSI to webui and onos-config
diff --git a/subscriber-proxy/files/certs/README.md b/subscriber-proxy/files/certs/README.md
new file mode 100644
index 0000000..54b62ae
--- /dev/null
+++ b/subscriber-proxy/files/certs/README.md
@@ -0,0 +1,32 @@
+<!--
+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 subscriber-proxy
+```
+
+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
diff --git a/subscriber-proxy/files/certs/tls.cacert b/subscriber-proxy/files/certs/tls.cacert
new file mode 100644
index 0000000..879bc06
--- /dev/null
+++ b/subscriber-proxy/files/certs/tls.cacert
@@ -0,0 +1,21 @@
+-----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/subscriber-proxy/files/certs/tls.crt b/subscriber-proxy/files/certs/tls.crt
new file mode 100644
index 0000000..3b4a936
--- /dev/null
+++ b/subscriber-proxy/files/certs/tls.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk4CFAGJmp4Hath03YSm4dunIw10dksyMA0GCSqGSIb3DQEBCwUAMHIx
+CzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTESMBAGA1UEBwwJTWVubG9QYXJrMQww
+CgYDVQQKDANPTkYxFDASBgNVBAsMC0VuZ2luZWVyaW5nMR4wHAYDVQQDDBVjYS5v
+cGVubmV0d29ya2luZy5vcmcwHhcNMjEwODE2MDYxNjEzWhcNMzEwODE0MDYxNjEz
+WjBtMQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExEjAQBgNVBAcMCU1lbmxvUGFy
+azEMMAoGA1UECgwDT05GMRQwEgYDVQQLDAtFbmdpbmVlcmluZzEZMBcGA1UEAwwQ
+c3Vic2NyaWJlci1wcm94eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANJOwRCu9BEToWSN3eizuQiWeeroM2+nTT89t2fW2PwiMI98aTQNwVza04LMthIu
+OtPoGGnJadWZAi6hPqZYHWAI/p8dfE+eE2ZN+jOifQ4k47JOKo8N52TR4c69aEMH
+oa922aXZsaQkYCL0Xh3hJ7iV6sELVZTRxP9xM2x2yHNzRiDKS7b23k/m7BS6zHm/
+kru3F7W08FQAxBo+8RlhJ++F5cqubND2Giwbjel6+ssbXh4aHwdFppvrW/LaeCnc
+0EzgMefBZnUKxhzV0s2CjCHjHDusK+u0ed0kDwLJcBPNIzYywZvoqUrq/D2NkcXL
+nZv5ONXD/bClTahr1ePqdDcCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEApTVTlHpB
+0wfgxlerJ+clfYs5TMoyU9RGg0fl7d/sHk/shohV5N7vaPCJL3TvrWNpwvwTUHk/
+zdh+OVdjgpscYJgeQnAaoe9CWLqJbVpYGIdOCOZA5eNTSmOjxRUunhPVKH2VEBe3
+RuAg0KjQVAy63Nmc20L38jhNnqr9kVkDMMRA0uSmKa058YHEBbB1N4dwwqO7kPin
+VTGXMLuLb0S/yfjKqtR6wOgeA/0gu17DJdJoRGybPO15kvvy67m5gmr9WZTaJaZj
+8EpHO0ZMJlSSV/IPZGqRDtBWXZuNuUPQuGUvGvJLXfgdo+aL9lKnNQK9v0FApXrc
+9Mkrr2Fy8WdfkQ==
+-----END CERTIFICATE-----
diff --git a/subscriber-proxy/files/certs/tls.key b/subscriber-proxy/files/certs/tls.key
new file mode 100644
index 0000000..ee55ea4
--- /dev/null
+++ b/subscriber-proxy/files/certs/tls.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDSTsEQrvQRE6Fk
+jd3os7kIlnnq6DNvp00/Pbdn1tj8IjCPfGk0DcFc2tOCzLYSLjrT6BhpyWnVmQIu
+oT6mWB1gCP6fHXxPnhNmTfozon0OJOOyTiqPDedk0eHOvWhDB6Gvdtml2bGkJGAi
+9F4d4Se4lerBC1WU0cT/cTNsdshzc0Ygyku29t5P5uwUusx5v5K7txe1tPBUAMQa
+PvEZYSfvheXKrmzQ9hosG43pevrLG14eGh8HRaab61vy2ngp3NBM4DHnwWZ1CsYc
+1dLNgowh4xw7rCvrtHndJA8CyXATzSM2MsGb6KlK6vw9jZHFy52b+TjVw/2wpU2o
+a9Xj6nQ3AgMBAAECggEAVdPiIubjoFx8j0b+e0tthj2y/9VHuJd0hQyw3uXlo/Bo
+FQbXAHFkqnp7u3PEEmNfir+7xuB2Gr/ZDiKsKMLpKhpBn7ou02dVz3ifVZdIpg8U
+Bd60q7Em8BRfrTnLZR+mMq+0X2UahDx8J4fHKTaMOV6lcacohBWf6gfOzsMjR0nU
+t1LQnpue3iFBcwt271B94sottuJCsBLeG4v77L4FSAln/J/3sh1j44rCBNCo4oV5
+3XNvdY7u9HMbN8c7zXycOBN2c49MrusvjQV8aY3wUT63ZeC30gtTwSgjJJ65vENF
+YyPEHo/2qZxoniqgA4OagxQ9h/XBlAA7Gvuy6yPxcQKBgQDsPIBnyRTsC7zRak0r
+2SCS5R50E2CYFciqRZGzsEHcDzV0m90ShiHOpbLcK2aut2u8rODpx3E52ZezqtAA
+YSzX/HQaOgp/QqHdVZwEYF0EXiDkMgBl175aPsSabBAXHkx4WL3vDZ6AjnTw9U6q
+rGIueVd5E5CGEMbKjRT9ZaO2swKBgQDj5u9TO4Ff64fto26pT5gTxecj2BVZWaLh
+DGufYLgOxWR8EzHeb5ygguFlO1hL0RV8sqk+WhcdQ4+Y8HnsOWXQB9W4As7FrONm
+swA12KaOQxG2vWxRQoGe7zcKpNVtTHDSAjgWs7HEy10AtbGbLTWdF1lwnotbgXPk
+1u71ENiubQKBgQDXGF9yIEzEgAt0Qe3yNsjJ94Q6/Em/MFZ9csqvaZUN4WsyuZgY
+/bhah9TLU1kzTB70tBQ1yDr4CX9vP+AT+Gb0YhD0sFROe0UWWpSsB3GqQGqCXGSw
+Vjgjw3MPh8U+x3+pNGP7/dKMCym/HBx8mmjrF+DlhULaTvwyATNTZfAisQKBgQDL
+tZyutT3LU2jIzZEY3gB9jCQzMe7DUw/4QXXhnD5pVZ+gGDg3L2S9RL/cENO30Uh3
+kesdxMFscvtkJW+V6yhKbvZl6HySzRrmrZG+j80w1Fp9EYxEhkH+oqx8YyIy9GTU
+Ew+3mx+HXI/hFoeOwTZvGHPl6pF+VZQWNNibTVehcQKBgQChQ4WOmRB0CmY2AFn+
+aagxTiHGBCvVhyxS9NNV3iGQM8h2iteoxbJF99p4RZhFqmFLW3XuhW4yaaSXcxFd
+skf27j15CbcHLt4KzHLHfFfiYMXPaCFefUGj7EeVvQJMM2KcRrX8ZlsnphOO9ecn
+YoE3q7tuYwlYmcAWYMF5uEaa+Q==
+-----END PRIVATE KEY-----
diff --git a/subscriber-proxy/templates/_helpers.tpl b/subscriber-proxy/templates/_helpers.tpl
new file mode 100644
index 0000000..ba0078e
--- /dev/null
+++ b/subscriber-proxy/templates/_helpers.tpl
@@ -0,0 +1,56 @@
+{{/* 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 "subscriber-proxy.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 "subscriber-proxy.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 "subscriber-proxy.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Common labels
+*/}}
+{{- define "subscriber-proxy.labels" -}}
+helm.sh/chart: {{ include "subscriber-proxy.chart" . }}
+{{ include "subscriber-proxy.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "subscriber-proxy.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "subscriber-proxy.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/subscriber-proxy/templates/configmap.yaml b/subscriber-proxy/templates/configmap.yaml
new file mode 100644
index 0000000..e1d59c2
--- /dev/null
+++ b/subscriber-proxy/templates/configmap.yaml
@@ -0,0 +1,19 @@
+# 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 "subscriber-proxy.fullname" . }}-logconfig
+  labels:
+    app: {{ template "subscriber-proxy.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+data:
+  logging.yaml: |-
+{{ toYaml .Values.logging | indent 4 }}
diff --git a/subscriber-proxy/templates/deployment.yaml b/subscriber-proxy/templates/deployment.yaml
new file mode 100644
index 0000000..2cbccc7
--- /dev/null
+++ b/subscriber-proxy/templates/deployment.yaml
@@ -0,0 +1,81 @@
+# 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 "subscriber-proxy.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    name: {{ template "subscriber-proxy.fullname" . }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "subscriber-proxy.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        name: {{ template "subscriber-proxy.fullname" . }}
+        {{- include "subscriber-proxy.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/subscriber-proxy"
+            - "-bind_port=:{{ .Values.ports.port }}"
+            - "-client_key=/etc/subscriber-proxy/certs/tls.key"
+            - "-client_crt=/etc/subscriber-proxy/certs/tls.crt"
+            - "-ca_crt=/etc/subscriber-proxy/certs/tls.cacert"
+            - "-alsologtostderr"
+            - "-hostCheckDisabled"
+            - "-webconsole_url=http://{{ .Values.ports.webui_endpt.addr}}:{{ .Values.ports.webui_endpt.port}}"
+            - "-onos_config_url={{ .Values.ports.aether_config_endpt.addr}}:{{ .Values.ports.aether_config_endpt.port}}"
+          ports:
+            - containerPort: {{.Values.ports.port}}
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.ports.port }}
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.ports.port }}
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          volumeMounts:
+            - name: secret
+              mountPath: /etc/subscriber-proxy/certs
+              readOnly: true
+            - name: logconfig
+              mountPath: /etc/onos/config
+              readOnly: true
+      volumes:
+        - name: logconfig
+          configMap:
+            name: {{ template "subscriber-proxy.fullname" . }}-logconfig
+        - name: secret
+          secret:
+            secretName: {{ template "subscriber-proxy.fullname" . }}-secret
diff --git a/subscriber-proxy/templates/secret.yaml b/subscriber-proxy/templates/secret.yaml
new file mode 100644
index 0000000..445c6bf
--- /dev/null
+++ b/subscriber-proxy/templates/secret.yaml
@@ -0,0 +1,18 @@
+# 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 "subscriber-proxy.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/subscriber-proxy/templates/service.yaml b/subscriber-proxy/templates/service.yaml
new file mode 100644
index 0000000..91e173c
--- /dev/null
+++ b/subscriber-proxy/templates/service.yaml
@@ -0,0 +1,24 @@
+# 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 "subscriber-proxy.fullname" . }}
+  labels:
+    app: {{ template "subscriber-proxy.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    release: "{{ .Release.Name }}"
+    heritage: "{{ .Release.Service }}"
+    {{- include "subscriber-proxy.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  selector:
+    name: {{ template "subscriber-proxy.fullname" . }}
+  ports:
+    - name: sub-proxy
+      port: {{.Values.ports.port}}
+      protocol: TCP
+
diff --git a/subscriber-proxy/values.yaml b/subscriber-proxy/values.yaml
new file mode 100644
index 0000000..4889fad
--- /dev/null
+++ b/subscriber-proxy/values.yaml
@@ -0,0 +1,60 @@
+# SPDX-FileCopyrightText: 2021-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.32
+  pullPolicy: IfNotPresent
+  pullSecrets: []
+
+resources:
+  requests:
+    cpu: 0.5
+    memory: 512Mi
+
+service:
+  type: ClusterIP
+
+model:
+  version: v3
+
+secure: true
+initialConfig: ""
+output: ""
+spgwEndpoint: ""
+
+ports:
+  port: 5001
+  webui_endpt:
+    addr: webui.omec.svc.cluster.local
+    port: 5000
+  aether_config_endpt:
+    addr: onos-config
+    port: 5150
+
+prometheusEnabled: true
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+logging:
+  loggers:
+    root:
+      level: info
+      output:
+        stdout:
+          sink: stdout
+  sinks:
+    stdout:
+      type: stdout
+      stdout: {}