diff --git a/config-models/aether-2.x/templates/_helpers.tpl b/config-models/aether-2.x/templates/_helpers.tpl
new file mode 100644
index 0000000..0380f1a
--- /dev/null
+++ b/config-models/aether-2.x/templates/_helpers.tpl
@@ -0,0 +1,52 @@
+{{/* 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.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.fullname" -}}
+{{- if contains "config-model-aether" .Release.Name -}}
+{{- printf "%s-%s" .Release.Name .Chart.AppVersion | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s-config-model-aether" .Release.Name .Chart.AppVersion | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "aether.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+
+{{/*
+Common labels
+*/}}
+{{- define "aether.labels" -}}
+helm.sh/chart: {{ include "aether.chart" . }}
+{{ include "aether.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Selector labels
+*/}}
+{{- define "aether.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "aether.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
+}
diff --git a/config-models/aether-2.x/templates/model.yaml b/config-models/aether-2.x/templates/model.yaml
new file mode 100644
index 0000000..787912e
--- /dev/null
+++ b/config-models/aether-2.x/templates/model.yaml
@@ -0,0 +1,53 @@
+# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
+#
+# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
+
+apiVersion: config.onosproject.org/v1beta1
+kind: Model
+metadata:
+  name: {{ template "aether.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "aether.labels" . | nindent 4 }}
+spec:
+  plugin:
+    type: Aether
+    version: {{ .Chart.AppVersion | quote }}
+  modules:
+  - name: aether-subscriber
+    organization: Open Networking Foundation
+    revision: 2020-10-22
+    file: aether-subscriber.yang
+  - name: apn-profile
+    organization: Open Networking Foundation
+    revision: 2020-10-22
+    file: apn-profile.yang
+  - name: up-profile
+    organization: Open Networking Foundation
+    revision: 2020-10-22
+    file: up-profile.yang
+  - name: qos-profile
+    organization: Open Networking Foundation
+    revision: 2020-10-22
+    file: qos-profile.yang
+  - name: access-profile
+    organization: Open Networking Foundation
+    revision: 2020-10-22
+    file: access-profile.yang
+  - name: enterprise
+    organization: Open Networking Foundation
+    revision: 2020-11-30
+    file: enterprise.yang
+  - name: connectivity-service
+    organization: Open Networking Foundation
+    revision: 2020-11-30
+    file: connectivity-service.yang
+  - name: security-profile
+    organization: Open Networking Foundation
+    revision: 2020-11-30
+    file: security-profile.yang
+  files:
+    {{- range $path, $_  := $.Files.Glob "files/yang/*.yang" }}
+    {{ base $path }}: |
+{{ $.Files.Get $path | indent 6 }}
+    {{- end }}