diff --git a/mcord-release/cdn-services/cdn-local/Chart.yaml b/cdn-services/cdn-local/Chart.yaml
similarity index 97%
rename from mcord-release/cdn-services/cdn-local/Chart.yaml
rename to cdn-services/cdn-local/Chart.yaml
index 7e74640..614bb98 100644
--- a/mcord-release/cdn-services/cdn-local/Chart.yaml
+++ b/cdn-services/cdn-local/Chart.yaml
@@ -17,4 +17,4 @@
 appVersion: "1.0"
 description: A Helm chart for M-CORD CDN Services in Local Edge
 name: cdn-local
-version: 0.0.3
+version: 0.0.4
diff --git a/mcord-release/cdn-services/cdn-local/templates/cm.yaml b/cdn-services/cdn-local/templates/cm.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-local/templates/cm.yaml
rename to cdn-services/cdn-local/templates/cm.yaml
diff --git a/mcord-release/cdn-services/cdn-local/templates/networks.yaml b/cdn-services/cdn-local/templates/networks.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-local/templates/networks.yaml
rename to cdn-services/cdn-local/templates/networks.yaml
diff --git a/mcord-release/cdn-services/cdn-local/templates/nginx.yaml b/cdn-services/cdn-local/templates/nginx.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-local/templates/nginx.yaml
rename to cdn-services/cdn-local/templates/nginx.yaml
diff --git a/mcord-release/cdn-services/cdn-local/values.yaml b/cdn-services/cdn-local/values.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-local/values.yaml
rename to cdn-services/cdn-local/values.yaml
diff --git a/mcord-release/cdn-services/cdn-remote/Chart.yaml b/cdn-services/cdn-remote/Chart.yaml
similarity index 97%
rename from mcord-release/cdn-services/cdn-remote/Chart.yaml
rename to cdn-services/cdn-remote/Chart.yaml
index a98e014..19ae4f8 100644
--- a/mcord-release/cdn-services/cdn-remote/Chart.yaml
+++ b/cdn-services/cdn-remote/Chart.yaml
@@ -17,4 +17,4 @@
 appVersion: "1.0"
 description: A Helm chart for M-CORD CDN Services in Remote Edge
 name: cdn-remote
-version: 0.0.3
+version: 0.0.4
diff --git a/mcord-release/cdn-services/cdn-remote/templates/ant-media.yaml b/cdn-services/cdn-remote/templates/ant-media.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-remote/templates/ant-media.yaml
rename to cdn-services/cdn-remote/templates/ant-media.yaml
diff --git a/mcord-release/cdn-services/cdn-remote/templates/cm.yaml b/cdn-services/cdn-remote/templates/cm.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-remote/templates/cm.yaml
rename to cdn-services/cdn-remote/templates/cm.yaml
diff --git a/mcord-release/cdn-services/cdn-remote/templates/remote-streamer.yaml b/cdn-services/cdn-remote/templates/remote-streamer.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-remote/templates/remote-streamer.yaml
rename to cdn-services/cdn-remote/templates/remote-streamer.yaml
diff --git a/mcord-release/cdn-services/cdn-remote/values.yaml b/cdn-services/cdn-remote/values.yaml
similarity index 100%
rename from mcord-release/cdn-services/cdn-remote/values.yaml
rename to cdn-services/cdn-remote/values.yaml
diff --git a/mcord-release/mcord-services/Chart.yaml b/mcord-release/mcord-services/Chart.yaml
deleted file mode 100644
index f6b9759..0000000
--- a/mcord-release/mcord-services/Chart.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v1
-appVersion: "1.0"
-description: M-CORD services with OMEC inside
-name: mcord-services
-version: 0.1.9
diff --git a/mcord-release/mcord-setup/.helmignore b/mcord-release/mcord-setup/.helmignore
deleted file mode 100644
index f0c1319..0000000
--- a/mcord-release/mcord-setup/.helmignore
+++ /dev/null
@@ -1,21 +0,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/mcord-release/mcord-setup/templates/NOTES.txt b/mcord-release/mcord-setup/templates/NOTES.txt
deleted file mode 100644
index 8304746..0000000
--- a/mcord-release/mcord-setup/templates/NOTES.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-{{- /*
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/ -}}
-
-Congratulations! You have installed SR-IOV network device plugin into your Kubernetes cluster.
-You can run following command to check SR-IOV is working in Kubernetes cluster:
-
-    $ kubectl -n kube-system -l name=sriov-device-plugin -o wide get pods
-    $ kubectl get nodes -o json | jq -r '.items[] | "\(.metadata.name): \(.status.allocatable)"'
-
-    node1: {"cpu":"39800m","ephemeral-storage":"452697199891","hugepages-1Gi":"32Gi","intel.com/sriov_vfio":"63","intel.com/sriov_netdevice":"63","memory":"31776336Ki","pods":"110"}
-    node2: {"cpu":"39800m","ephemeral-storage":"452697199891","hugepages-1Gi":"32Gi","intel.com/sriov_vfio":"63","intel.com/sriov_netdevice":"63","memory":"31776336Ki","pods":"110"}
-
-The result should show "intel.com/sriov_*" resource is registered to cluster, and have some virtual function available here.
diff --git a/mcord-release/mcord-setup/templates/_helpers.tpl b/mcord-release/mcord-setup/templates/_helpers.tpl
deleted file mode 100644
index aabdc98..0000000
--- a/mcord-release/mcord-setup/templates/_helpers.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-{{- /*
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/ -}}
-
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "mcord-setup.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 "mcord-setup.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 "mcord-setup.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/mcord-release/mcord-setup/values.yaml b/mcord-release/mcord-setup/values.yaml
deleted file mode 100644
index e9d4d7f..0000000
--- a/mcord-release/mcord-setup/values.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2018-present Open Networking Foundation
-# Copyright 2018 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-images:
-  tags:
-    omecCni: docker.io/omecproject/omec-cni:0.0.1
-    sriovDp: docker.io/nfvpe/sriov-device-plugin:v3.0.0
-  pullPolicy: IfNotPresent
-
-# We need to speficy both pfName and driver name to prevent one interface to be
-# allocated to multiple resource pools
-resourceList:
-  - resourceName: sriov_vfio
-    # Provide vfio-pci bounded physical function names in your cluster under "pfNames"
-    # Do not change "drivers" unless you know what you're doing
-    selectors:
-      pfNames:
-        - eno1
-      drivers:
-        - vfio-pci
-  - resourceName: sriov_netdevice
-     # Provide pfNames and their drivers that serve virtual functions in your cluster
-    selectors:
-      pfNames:
-        - eno1
-      drivers:
-        - ixgbevf
diff --git a/mcord-release/assets/mcord-architecture.png b/omec/assets/omec-architecture.png
similarity index 100%
rename from mcord-release/assets/mcord-architecture.png
rename to omec/assets/omec-architecture.png
Binary files differ
diff --git a/mcord-release/mcord-services/.gitignore b/omec/omec-control-plane/.gitignore
similarity index 100%
rename from mcord-release/mcord-services/.gitignore
rename to omec/omec-control-plane/.gitignore
diff --git a/mcord-release/mcord-services/.helmignore b/omec/omec-control-plane/.helmignore
similarity index 100%
rename from mcord-release/mcord-services/.helmignore
rename to omec/omec-control-plane/.helmignore
diff --git a/mcord-release/mcord-setup/Chart.yaml b/omec/omec-control-plane/Chart.yaml
similarity index 88%
copy from mcord-release/mcord-setup/Chart.yaml
copy to omec/omec-control-plane/Chart.yaml
index 7f96054..fc625fb 100644
--- a/mcord-release/mcord-setup/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -16,6 +16,6 @@
 
 apiVersion: v1
 appVersion: "1.0"
-description: The prerequisite setup of M-CORD
-name: mcord-setup
-version: 0.1.4
+description: OMEC control plane services
+name: omec-control-plane
+version: 0.1.0
diff --git a/mcord-release/mcord-services/requirements.yaml b/omec/omec-control-plane/requirements.yaml
similarity index 100%
rename from mcord-release/mcord-services/requirements.yaml
rename to omec/omec-control-plane/requirements.yaml
diff --git a/mcord-release/mcord-services/templates/NOTES.txt b/omec/omec-control-plane/templates/NOTES.txt
similarity index 100%
rename from mcord-release/mcord-services/templates/NOTES.txt
rename to omec/omec-control-plane/templates/NOTES.txt
diff --git a/mcord-release/mcord-services/templates/_helpers.tpl b/omec/omec-control-plane/templates/_helpers.tpl
similarity index 83%
rename from mcord-release/mcord-services/templates/_helpers.tpl
rename to omec/omec-control-plane/templates/_helpers.tpl
index dde3e3d..91aa5b6 100644
--- a/mcord-release/mcord-services/templates/_helpers.tpl
+++ b/omec/omec-control-plane/templates/_helpers.tpl
@@ -16,15 +16,9 @@
 */ -}}
 
 {{/*
-abstract: |
-  Renders a set of standardised labels
-usage: |
-  {{ tuple "mme" . | include "mcord-services.metadata_labels" }}
-return: |
-  release: mcord-services
-  app: mme
+Renders a set of standardised labels
 */}}
-{{- define "mcord-services.metadata_labels" -}}
+{{- define "omec-control-plane.metadata_labels" -}}
 {{- $application := index . 0 -}}
 {{- $context := index . 1 -}}
 release: {{ $context.Release.Name }}
@@ -34,7 +28,7 @@
 {{/*
 Render the given template.
 */}}
-{{- define "mcord-services.template" -}}
+{{- define "omec-control-plane.template" -}}
 {{- $name := index . 0 -}}
 {{- $context := index . 1 -}}
 {{- $last := base $context.Template.Name }}
@@ -45,7 +39,7 @@
 {{/*
 Return identity, realm, and hostname of the first pod of the given statefulset.
 */}}
-{{- define "mcord-services.endpoint_lookup" -}}
+{{- define "omec-control-plane.endpoint_lookup" -}}
 {{- $service := index . 0 -}}
 {{- $type := index . 1 -}}
 {{- $context := index . 2 -}}
diff --git a/mcord-release/mcord-services/templates/bin/_mme-init.sh.tpl b/omec/omec-control-plane/templates/bin/_mme-init.sh.tpl
similarity index 88%
rename from mcord-release/mcord-services/templates/bin/_mme-init.sh.tpl
rename to omec/omec-control-plane/templates/bin/_mme-init.sh.tpl
index a15e83c..0b2e163 100644
--- a/mcord-release/mcord-services/templates/bin/_mme-init.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_mme-init.sh.tpl
@@ -25,7 +25,7 @@
 jq --arg MME_LOCAL_IP "$MME_LOCAL_IP" '.s11.egtp_local_addr=$MME_LOCAL_IP' config.json > config.tmp && mv config.tmp config.json
 
 # Set SPGW-C address to the config
-SPGWC_POD={{ tuple "spgwc" "identity" . | include "mcord-services.endpoint_lookup" | quote }}
+SPGWC_POD={{ tuple "spgwc" "identity" . | include "omec-control-plane.endpoint_lookup" | quote }}
 SPGWC_ADDR=$(dig +short $SPGWC_POD)
 jq --arg SPGWC_ADDR "$SPGWC_ADDR" '.s11.sgw_addr //= $SPGWC_ADDR' config.json > config.tmp && mv config.tmp config.json
 jq --arg SPGWC_ADDR "$SPGWC_ADDR" '.s11.pgw_addr //= $SPGWC_ADDR' config.json > config.tmp && mv config.tmp config.json
@@ -44,9 +44,9 @@
 cp /opt/mme/config/s6a_fd.conf /opt/mme/config/shared/s6a_fd.conf
 
 # Generate certs
-MME_IDENTITY={{ tuple "mme" "identity" . | include "mcord-services.endpoint_lookup" | quote }};
+MME_IDENTITY={{ tuple "mme" "identity" . | include "omec-control-plane.endpoint_lookup" | quote }};
 DIAMETER_HOST=$(echo $MME_IDENTITY | cut -d'.' -f1)
-DIAMETER_REALM={{ tuple "mme" "realm" . | include "mcord-services.endpoint_lookup" | quote }};
+DIAMETER_REALM={{ tuple "mme" "realm" . | include "omec-control-plane.endpoint_lookup" | quote }};
 
 cp /openmme/target/conf/make_certs.sh /opt/mme/config/shared/make_certs.sh
 cd /opt/mme/config/shared
diff --git a/mcord-release/mcord-services/templates/bin/_mme-run.sh.tpl b/omec/omec-control-plane/templates/bin/_mme-run.sh.tpl
similarity index 100%
rename from mcord-release/mcord-services/templates/bin/_mme-run.sh.tpl
rename to omec/omec-control-plane/templates/bin/_mme-run.sh.tpl
diff --git a/mcord-release/mcord-services/templates/configmap-mme.yaml b/omec/omec-control-plane/templates/configmap-mme.yaml
similarity index 83%
rename from mcord-release/mcord-services/templates/configmap-mme.yaml
rename to omec/omec-control-plane/templates/configmap-mme.yaml
index fd40c05..6b33a51 100644
--- a/mcord-release/mcord-services/templates/configmap-mme.yaml
+++ b/omec/omec-control-plane/templates/configmap-mme.yaml
@@ -15,10 +15,10 @@
 */}}
 
 {{- if not (hasKey .Values.config.mme.s6a "host") -}}
-{{- $_ := tuple "hss" "identity" . | include "mcord-services.endpoint_lookup" | set .Values.config.mme.s6a "host" -}}
+{{- $_ := tuple "hss" "identity" . | include "omec-control-plane.endpoint_lookup" | set .Values.config.mme.s6a "host" -}}
 {{- end }}
 {{- if not (hasKey .Values.config.mme.s6a "realm") -}}
-{{- $_ := tuple "hss" "realm" . | include "mcord-services.endpoint_lookup" | set .Values.config.mme.s6a "realm" -}}
+{{- $_ := tuple "hss" "realm" . | include "omec-control-plane.endpoint_lookup" | set .Values.config.mme.s6a "realm" -}}
 {{- end }}
 ---
 apiVersion: v1
@@ -26,7 +26,7 @@
 metadata:
   name: mme
   labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 data:
   config.json: {{ toJson .Values.config.mme | quote }}
   s6a_fd.conf: |
@@ -37,16 +37,16 @@
     No_IPv6;
 
     # Identity = "<diameter_host>.<diameter_realm>";
-    Identity = {{ tuple "mme" "identity" . | include "mcord-services.endpoint_lookup" | quote }};
-    Realm = {{ tuple "mme" "realm" . | include "mcord-services.endpoint_lookup" | quote }};
+    Identity = {{ tuple "mme" "identity" . | include "omec-control-plane.endpoint_lookup" | quote }};
+    Realm = {{ tuple "mme" "realm" . | include "omec-control-plane.endpoint_lookup" | quote }};
     # Port = 3868;
     # SecPort = 3869;
 
-    ConnectPeer = {{ tuple "hss" "identity" . | include "mcord-services.endpoint_lookup" | quote }} { No_TLS; port = 3868; };
+    ConnectPeer = {{ tuple "hss" "identity" . | include "omec-control-plane.endpoint_lookup" | quote }} { No_TLS; port = 3868; };
 
     # TLS_Cred = "<diameter_host>.cert.pem", "<diameter_host>.key.pem";
-    TLS_Cred = "conf/{{ tuple "mme" "host" . | include "mcord-services.endpoint_lookup" }}.cert.pem",
-               "conf/{{ tuple "mme" "host" . | include "mcord-services.endpoint_lookup" }}.key.pem";
+    TLS_Cred = "conf/{{ tuple "mme" "host" . | include "omec-control-plane.endpoint_lookup" }}.cert.pem",
+               "conf/{{ tuple "mme" "host" . | include "omec-control-plane.endpoint_lookup" }}.key.pem";
     TLS_CA = "conf/cacert.pem";
 
     LoadExtension = "/usr/local/lib/freeDiameter/dict_3gpp2_avps.fdx";
@@ -109,6 +109,6 @@
     LoadExtension = "/usr/local/lib/freeDiameter/dict_T6aT6bT7.fdx";
     #LoadExtension = "/usr/local/lib/freeDiameter/dict_Tsp.fdx";
   mme-init.sh: |
-{{ tuple "bin/_mme-init.sh.tpl" . | include "mcord-services.template" | indent 4 }}
+{{ tuple "bin/_mme-init.sh.tpl" . | include "omec-control-plane.template" | indent 4 }}
   mme-run.sh : |
-{{ tuple "bin/_mme-run.sh.tpl" . | include "mcord-services.template" | indent 4 }}
+{{ tuple "bin/_mme-run.sh.tpl" . | include "omec-control-plane.template" | indent 4 }}
diff --git a/mcord-release/mcord-services/templates/hss.yaml b/omec/omec-control-plane/templates/hss.yaml
similarity index 92%
rename from mcord-release/mcord-services/templates/hss.yaml
rename to omec/omec-control-plane/templates/hss.yaml
index 10288a6..f773eb1 100644
--- a/mcord-release/mcord-services/templates/hss.yaml
+++ b/omec/omec-control-plane/templates/hss.yaml
@@ -28,7 +28,7 @@
 metadata:
   name: hss
   labels:
-{{ tuple "hss" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 data:
   acl.conf: |
     ALLOW_OLD_TLS   *.cluster.local
@@ -213,10 +213,10 @@
 metadata:
   name: hss
   labels:
-{{ tuple "hss" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
   selector:
-{{ tuple "hss" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 4 }}
   clusterIP: None
   ports:
   - name: s6a
@@ -228,17 +228,17 @@
 metadata:
   name: hss
   labels:
-{{ tuple "hss" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-{{ tuple "hss" . | include "mcord-services.metadata_labels" | indent 6 }}
+{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 6 }}
   serviceName: hss
   template:
     metadata:
       labels:
-{{ tuple "hss" . | include "mcord-services.metadata_labels" | indent 8 }}
+{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 8 }}
     spec:
     {{- if .Values.nodeSelectors.enabled }}
       nodeSelector:
@@ -261,9 +261,9 @@
         - name: HSSDB_ADDR
           value: {{ .Values.config.hss.hssdb }}
         - name: MME_HOST
-          value: {{ tuple "mme" "host" . | include "mcord-services.endpoint_lookup" | quote }}
+          value: {{ tuple "mme" "host" . | include "omec-control-plane.endpoint_lookup" | quote }}
         - name: MME_REALM
-          value: {{ tuple "mme" "realm" . | include "mcord-services.endpoint_lookup" | quote }}
+          value: {{ tuple "mme" "realm" . | include "omec-control-plane.endpoint_lookup" | quote }}
       containers:
       - name: hss
         image: {{ .Values.images.tags.hss }}
@@ -274,7 +274,7 @@
         - name: HSSDB_ADDR
           value: {{ .Values.config.hss.hssdb }}
         - name: MME_IDENTITY
-          value: {{ tuple "mme" "identity" . | include "mcord-services.endpoint_lookup" | quote }}
+          value: {{ tuple "mme" "identity" . | include "omec-control-plane.endpoint_lookup" | quote }}
         command: ["bash", "-c", "/opt/c3po/hss/launch.sh; sleep 3600"]
       {{- if .Values.resources.enabled }}
         resources:
diff --git a/mcord-release/mcord-services/templates/service-mme.yaml b/omec/omec-control-plane/templates/service-mme.yaml
similarity index 77%
rename from mcord-release/mcord-services/templates/service-mme.yaml
rename to omec/omec-control-plane/templates/service-mme.yaml
index db6a8af..265e9e8 100644
--- a/mcord-release/mcord-services/templates/service-mme.yaml
+++ b/omec/omec-control-plane/templates/service-mme.yaml
@@ -20,10 +20,10 @@
 metadata:
   name: mme
   labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
   selector:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
   clusterIP: None
   ports:
   - name: s11
@@ -38,10 +38,10 @@
 metadata:
   name: mme-sctp
   labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
   selector:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
   type: NodePort
   ports:
     - name: s1ap
diff --git a/mcord-release/mcord-services/templates/spgwc.yaml b/omec/omec-control-plane/templates/spgwc.yaml
similarity index 92%
rename from mcord-release/mcord-services/templates/spgwc.yaml
rename to omec/omec-control-plane/templates/spgwc.yaml
index 3dbd2e5..0b17a0f 100644
--- a/mcord-release/mcord-services/templates/spgwc.yaml
+++ b/omec/omec-control-plane/templates/spgwc.yaml
@@ -20,14 +20,14 @@
 metadata:
   name: spgwc
   labels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: spgwc
   labels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 rules:
 - apiGroups: [""]
   resources: ["pods"]
@@ -38,7 +38,7 @@
 metadata:
   name: spgwc
   labels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -52,7 +52,7 @@
 metadata:
   name: spgwc
   labels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 data:
   launch.sh: |
     #!/bin/bash -xe
@@ -63,6 +63,7 @@
     cp /etc/cp/config/{adc_rules.cfg,cp_config.cfg,interface.cfg,meter_profile.cfg,pcc_rules.cfg,sdf_rules.cfg} .
     sed -i "s/CP_ADDR/$CP_ADDR/g" interface.cfg
     sed -i "s/DP_ADDR/$DP_ADDR/g" interface.cfg
+    sed -i "s/DP_PORT/$DP_PORT/g" interface.cfg
     . cp_config.cfg
     ngic_controlplane $EAL_ARGS -- $APP_ARGS
   cp_config.cfg: |
@@ -90,7 +91,7 @@
   interface.cfg: |
     [0]
     dp_comm_ip = DP_ADDR
-    dp_comm_port = 20
+    dp_comm_port = DP_PORT
     cp_comm_ip = CP_ADDR
     cp_comm_port = 21
   adc_rules.cfg: |
@@ -443,10 +444,10 @@
 metadata:
   name: spgwc
   labels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
   selector:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
   clusterIP: None
   ports:
   - name: s11
@@ -461,17 +462,17 @@
 metadata:
   name: spgwc
   labels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 6 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 6 }}
   serviceName: spgwc
   template:
     metadata:
       labels:
-{{ tuple "spgwc" . | include "mcord-services.metadata_labels" | indent 8 }}
+{{ tuple "spgwc" . | include "omec-control-plane.metadata_labels" | indent 8 }}
     spec:
     {{- if .Values.nodeSelectors.enabled }}
       nodeSelector:
@@ -507,9 +508,11 @@
             fieldRef:
               fieldPath: status.podIP
         - name: DP_ADDR
-          value: spgwu-0.spgwu
+          value: {{ .Values.config.spgwc.spgwu.addr | quote }}
+        - name: DP_PORT
+          value: {{ .Values.config.spgwc.spgwu.port | quote }}
         - name: MME_S11_IP
-          value: {{ tuple "mme" "identity" . | include "mcord-services.endpoint_lookup" | quote }}
+          value: {{ tuple "mme" "identity" . | include "omec-control-plane.endpoint_lookup" | quote }}
         - name: APN
           value: apn1
         - name: IP_POOL_IP
diff --git a/mcord-release/mcord-services/templates/statefulset-mme.yaml b/omec/omec-control-plane/templates/statefulset-mme.yaml
similarity index 92%
rename from mcord-release/mcord-services/templates/statefulset-mme.yaml
rename to omec/omec-control-plane/templates/statefulset-mme.yaml
index 30c6eaa..af37c34 100644
--- a/mcord-release/mcord-services/templates/statefulset-mme.yaml
+++ b/omec/omec-control-plane/templates/statefulset-mme.yaml
@@ -20,14 +20,14 @@
 metadata:
   name: mme
   labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: mme
   labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 rules:
   - apiGroups:
       - ""
@@ -49,7 +49,7 @@
 metadata:
   name: mme
   labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -63,17 +63,17 @@
 metadata:
   name: mme
   labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 4 }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 6 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 6 }}
   serviceName: mme
   template:
     metadata:
       labels:
-{{ tuple "mme" . | include "mcord-services.metadata_labels" | indent 8 }}
+{{ tuple "mme" . | include "omec-control-plane.metadata_labels" | indent 8 }}
     spec:
     {{- if .Values.nodeSelectors.enabled }}
       nodeSelector:
diff --git a/mcord-release/mcord-services/values.yaml b/omec/omec-control-plane/values.yaml
similarity index 71%
rename from mcord-release/mcord-services/values.yaml
rename to omec/omec-control-plane/values.yaml
index 32938fa..2c83ee6 100644
--- a/mcord-release/mcord-services/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -20,7 +20,6 @@
     hss: docker.io/omecproject/c3po-hss:0.1.0-dev
     mme: docker.io/omecproject/openmme:0.1.0-dev
     spgwc: docker.io/omecproject/ngic-cp:0.1.0-dev
-    spgwu: docker.io/omecproject/ngic-dp:0.1.0-dev
     depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
   pullPolicy: IfNotPresent
 
@@ -35,9 +34,6 @@
   spgwc:
     label: omec-cp
     value: enabled
-  spgwu:
-    label: omec-dp
-    value: enabled
 
 resources:
   enabled: true
@@ -64,13 +60,6 @@
     limits:
       cpu: 2
       memory: 5Gi
-  spgwu:
-    requests:
-      cpu: 4
-      memory: 8Gi
-    limits:
-      cpu: 4
-      memory: 8Gi
 
 cassandra:
   deploy: true
@@ -123,30 +112,8 @@
       # host and realm will be set dynamically if unset
       #host:
       #realm:
-  spgwc: {}
-  spgwu:
-    dp:
-      # s1u and sgi interfaces are fixed to "s1u-net" and "sgi-net"
-      # Note that s1uAfDev and sgiAfDev are valid only when sriov is disabled
-      # setup-af-iface.sh script creates additional veth pair with the names here
-      s1uAfDev: s1u-veth
-      sgiAfDev: sgi-veth
-      # set "--no-pci --vdev eth_af_packet0,iface=s1u-net --vdev eth_af_packet1,iface=sgi-net"
-      # when sriov is disabled
-      devices: ""
-      rtrSgiIp: 13.1.1.254
-      sgiMask: 255.255.255.0
-
-networks:
-  sriov:
-    enabled: true
-  cniPlugin: vfioveth
-  ipam: centralip
-  # etcdurl is required only when centralip IPAM is used
-  etcdurl: http://localhost:32379
-  s1u:
-    subnet: 119.0.0.0/24
-    gateway: 119.0.0.254
-  sgi:
-    subnet: 13.1.1.0/24
-    gateway: 13.1.1.254
+  spgwc:
+    # make it global
+    spgwu:
+      addr: spgwu
+      port: 20
diff --git a/mcord-release/mcord-services/.gitignore b/omec/omec-data-plane/.gitignore
similarity index 100%
copy from mcord-release/mcord-services/.gitignore
copy to omec/omec-data-plane/.gitignore
diff --git a/mcord-release/mcord-services/.helmignore b/omec/omec-data-plane/.helmignore
similarity index 100%
copy from mcord-release/mcord-services/.helmignore
copy to omec/omec-data-plane/.helmignore
diff --git a/mcord-release/mcord-setup/Chart.yaml b/omec/omec-data-plane/Chart.yaml
similarity index 89%
rename from mcord-release/mcord-setup/Chart.yaml
rename to omec/omec-data-plane/Chart.yaml
index 7f96054..2f8d0e1 100644
--- a/mcord-release/mcord-setup/Chart.yaml
+++ b/omec/omec-data-plane/Chart.yaml
@@ -16,6 +16,6 @@
 
 apiVersion: v1
 appVersion: "1.0"
-description: The prerequisite setup of M-CORD
-name: mcord-setup
-version: 0.1.4
+description: OMEC data plane services
+name: omec-data-plane
+version: 0.1.0
diff --git a/omec/omec-data-plane/templates/_helpers.tpl b/omec/omec-data-plane/templates/_helpers.tpl
new file mode 100644
index 0000000..af69c64
--- /dev/null
+++ b/omec/omec-data-plane/templates/_helpers.tpl
@@ -0,0 +1,36 @@
+{{- /*
+# Copyright 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/ -}}
+
+{{/*
+Renders a set of standardised labels.
+*/}}
+{{- define "omec-data-plane.metadata_labels" -}}
+{{- $application := index . 0 -}}
+{{- $context := index . 1 -}}
+release: {{ $context.Release.Name }}
+app: {{ $application }}
+{{- end -}}
+
+{{/*
+Render the given template.
+*/}}
+{{- define "omec-data-plane.template" -}}
+{{- $name := index . 0 -}}
+{{- $context := index . 1 -}}
+{{- $last := base $context.Template.Name }}
+{{- $wtf := $context.Template.Name | replace $last $name -}}
+{{ include $wtf $context }}
+{{- end -}}
diff --git a/mcord-release/mcord-services/templates/bin/_spgwu-run.sh.tpl b/omec/omec-data-plane/templates/bin/_spgwu-run.sh.tpl
similarity index 95%
rename from mcord-release/mcord-services/templates/bin/_spgwu-run.sh.tpl
rename to omec/omec-data-plane/templates/bin/_spgwu-run.sh.tpl
index abbbed3..9582e14 100644
--- a/mcord-release/mcord-services/templates/bin/_spgwu-run.sh.tpl
+++ b/omec/omec-data-plane/templates/bin/_spgwu-run.sh.tpl
@@ -23,6 +23,7 @@
 cp /etc/dp/config/{cdr.cfg,dp_config.cfg,interface.cfg} .
 
 sed -i "s/CP_ADDR/$CP_ADDR/g" interface.cfg
+sed -i "s/CP_PORT/$CP_PORT/g" interface.cfg
 sed -i "s/DP_ADDR/$DP_ADDR/g" interface.cfg
 
 source dp_config.cfg
diff --git a/mcord-release/mcord-services/templates/bin/_spgwu-setup-af-iface.sh.tpl b/omec/omec-data-plane/templates/bin/_spgwu-setup-af-iface.sh.tpl
similarity index 93%
rename from mcord-release/mcord-services/templates/bin/_spgwu-setup-af-iface.sh.tpl
rename to omec/omec-data-plane/templates/bin/_spgwu-setup-af-iface.sh.tpl
index 4988379..ad8eded 100644
--- a/mcord-release/mcord-services/templates/bin/_spgwu-setup-af-iface.sh.tpl
+++ b/omec/omec-data-plane/templates/bin/_spgwu-setup-af-iface.sh.tpl
@@ -17,8 +17,8 @@
 
 set -ex
 
-UL_IFACE="{{- .Values.config.spgwu.dp.s1uAfDev -}}"
-DL_IFACE="{{- .Values.config.spgwu.dp.sgiAfDev -}}"
+UL_IFACE="{{- .Values.config.spgwu.s1uAfDev -}}"
+DL_IFACE="{{- .Values.config.spgwu.sgiAfDev -}}"
 
 if ! ip link show $UL_IFACE; then
     s1u_mac=$(ip addr show dev s1u-net | awk '$1=="link/ether"{print $2}')
diff --git a/mcord-release/mcord-services/templates/configmap-spgwu.yaml b/omec/omec-data-plane/templates/configmap-spgwu.yaml
similarity index 83%
rename from mcord-release/mcord-services/templates/configmap-spgwu.yaml
rename to omec/omec-data-plane/templates/configmap-spgwu.yaml
index b821eb0..2db74f3 100644
--- a/mcord-release/mcord-services/templates/configmap-spgwu.yaml
+++ b/omec/omec-data-plane/templates/configmap-spgwu.yaml
@@ -20,7 +20,7 @@
 metadata:
   name: spgwu
   labels:
-{{ tuple "spgwu" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwu" . | include "omec-data-plane.metadata_labels" | indent 4 }}
 data:
   dp_config.cfg: |
     if [ ! -d "/dev/hugepages" ]; then
@@ -47,10 +47,10 @@
     dp_comm_ip = DP_ADDR
     dp_comm_port = 20
     cp_comm_ip = CP_ADDR
-    cp_comm_port = 21
-{{- if not .Values.networks.sriov.enabled }}
+    cp_comm_port = CP_PORT
+{{- if not .Values.config.sriov.enabled }}
   setup-af-iface.sh: |
-{{ tuple "bin/_spgwu-setup-af-iface.sh.tpl" . | include "mcord-services.template" | indent 4 }}
+{{ tuple "bin/_spgwu-setup-af-iface.sh.tpl" . | include "omec-data-plane.template" | indent 4 }}
 {{- end }}
   run.sh: |
-{{ tuple "bin/_spgwu-run.sh.tpl" . | include "mcord-services.template" | indent 4 }}
+{{ tuple "bin/_spgwu-run.sh.tpl" . | include "omec-data-plane.template" | indent 4 }}
diff --git a/mcord-release/mcord-setup/templates/configmap-sriov-conf.yaml b/omec/omec-data-plane/templates/configmap-sriov-conf.yaml
similarity index 85%
rename from mcord-release/mcord-setup/templates/configmap-sriov-conf.yaml
rename to omec/omec-data-plane/templates/configmap-sriov-conf.yaml
index 65623f9..4b8fd9a 100644
--- a/mcord-release/mcord-setup/templates/configmap-sriov-conf.yaml
+++ b/omec/omec-data-plane/templates/configmap-sriov-conf.yaml
@@ -15,6 +15,7 @@
 limitations under the License.
 */}}
 
+{{- if .Values.config.sriov.enabled }}
 ---
 kind: ConfigMap
 apiVersion: v1
@@ -23,5 +24,6 @@
 data:
   config.json: |
     {
-      "resourceList": {{ toJson .Values.resourceList }}
+      "resourceList": {{ toJson .Values.config.sriov.resourceList }}
     }
+{{- end }}
diff --git a/mcord-release/mcord-setup/templates/daemonset-sriov-dp.yaml b/omec/omec-data-plane/templates/daemonset-sriov-dp.yaml
similarity index 97%
rename from mcord-release/mcord-setup/templates/daemonset-sriov-dp.yaml
rename to omec/omec-data-plane/templates/daemonset-sriov-dp.yaml
index 3e459e1..9c3ceea 100644
--- a/mcord-release/mcord-setup/templates/daemonset-sriov-dp.yaml
+++ b/omec/omec-data-plane/templates/daemonset-sriov-dp.yaml
@@ -14,6 +14,8 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 */}}
+
+{{- if .Values.config.sriov.enabled }}
 ---
 apiVersion: apps/v1
 kind: DaemonSet
@@ -70,3 +72,4 @@
       - name: cni-bin
         hostPath:
           path: /opt/cni/bin
+{{- end }}
diff --git a/mcord-release/mcord-services/templates/networks.yaml b/omec/omec-data-plane/templates/networks.yaml
similarity index 95%
rename from mcord-release/mcord-services/templates/networks.yaml
rename to omec/omec-data-plane/templates/networks.yaml
index 075c94e..a82e3ae 100644
--- a/mcord-release/mcord-services/templates/networks.yaml
+++ b/omec/omec-data-plane/templates/networks.yaml
@@ -20,7 +20,7 @@
 kind: NetworkAttachmentDefinition
 metadata:
   name: s1u-net
-{{- if $.Values.networks.sriov.enabled }}
+{{- if $.Values.config.sriov.enabled }}
   annotations:
     k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio
 {{- end }}
@@ -44,7 +44,7 @@
 kind: NetworkAttachmentDefinition
 metadata:
   name: sgi-net
-{{- if $.Values.networks.sriov.enabled }}
+{{- if $.Values.config.sriov.enabled }}
   annotations:
     k8s.v1.cni.cncf.io/resourceName: intel.com/sriov_vfio
 {{- end }}
diff --git a/mcord-release/mcord-services/templates/service-spgwu.yaml b/omec/omec-data-plane/templates/service-spgwu.yaml
similarity index 90%
rename from mcord-release/mcord-services/templates/service-spgwu.yaml
rename to omec/omec-data-plane/templates/service-spgwu.yaml
index 6b07e4c..dd4766e 100644
--- a/mcord-release/mcord-services/templates/service-spgwu.yaml
+++ b/omec/omec-data-plane/templates/service-spgwu.yaml
@@ -22,7 +22,7 @@
   name: spgwu
 spec:
   selector:
-{{ tuple "spgwu" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwu" . | include "omec-data-plane.metadata_labels" | indent 4 }}
   clusterIP: None
   ports:
   - name: cpdp
diff --git a/mcord-release/mcord-services/templates/statefulset-spgwu.yaml b/omec/omec-data-plane/templates/statefulset-spgwu.yaml
similarity index 80%
rename from mcord-release/mcord-services/templates/statefulset-spgwu.yaml
rename to omec/omec-data-plane/templates/statefulset-spgwu.yaml
index 6b4f845..b1a2c1a 100644
--- a/mcord-release/mcord-services/templates/statefulset-spgwu.yaml
+++ b/omec/omec-data-plane/templates/statefulset-spgwu.yaml
@@ -20,17 +20,17 @@
 metadata:
   name: spgwu
   labels:
-{{ tuple "spgwu" . | include "mcord-services.metadata_labels" | indent 4 }}
+{{ tuple "spgwu" . | include "omec-data-plane.metadata_labels" | indent 4 }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-{{ tuple "spgwu" . | include "mcord-services.metadata_labels" | indent 6 }}
+{{ tuple "spgwu" . | include "omec-data-plane.metadata_labels" | indent 6 }}
   serviceName: spgwu
   template:
     metadata:
       labels:
-{{ tuple "spgwu" . | include "mcord-services.metadata_labels" | indent 8 }}
+{{ tuple "spgwu" . | include "omec-data-plane.metadata_labels" | indent 8 }}
       annotations:
         k8s.v1.cni.cncf.io/networks: '[
                 { "name": "s1u-net", "interface": "s1u-net" },
@@ -41,7 +41,7 @@
       nodeSelector:
         {{ .Values.nodeSelectors.spgwu.label }}: {{ .Values.nodeSelectors.spgwu.value }}
     {{- end }}
-    {{- if not .Values.networks.sriov.enabled }}
+    {{- if not .Values.config.sriov.enabled }}
       initContainers:
         - name: spgwu-iptables-init
           image: {{ .Values.images.tags.init | quote }}
@@ -81,29 +81,31 @@
               resource: limits.memory
               divisor: 1Mi
         - name: S1U_DEVNAME
-        {{- if .Values.networks.sriov.enabled }}
+        {{- if .Values.config.sriov.enabled }}
           value: s1u-net
         {{- else }}
-          value: {{ .Values.config.spgwu.dp.s1uAfDev | quote }}
+          value: {{ .Values.config.spgwu.s1uAfDev | quote }}
         {{- end }}
         - name: SGI_DEVNAME
-        {{- if .Values.networks.sriov.enabled }}
+        {{- if .Values.config.sriov.enabled }}
           value: sgi-net
         {{- else }}
-          value: {{ .Values.config.spgwu.dp.sgiAfDev | quote }}
+          value: {{ .Values.config.spgwu.sgiAfDev | quote }}
         {{- end }}
         - name: DEVICES
-          value: {{ .Values.config.spgwu.dp.devices | quote }}
+          value: {{ .Values.config.spgwu.devices | quote }}
         - name: CP_ADDR
-          value: spgwc-0.spgwc
+          value: {{ .Values.config.spgwu.spgwc.addr | quote }}
+        - name: CP_PORT
+          value: {{ .Values.config.spgwu.spgwc.port | quote }}
         - name: DP_ADDR
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
         - name: RTR_SGI_IP
-          value: {{ .Values.config.spgwu.dp.rtrSgiIp | quote }}
+          value: {{ .Values.config.spgwu.rtrSgiIp | quote }}
         - name: SGI_MASK
-          value: {{ .Values.config.spgwu.dp.sgiMask | quote }}
+          value: {{ .Values.config.spgwu.sgiMask | quote }}
         command: ["bash", "-xc"]
         args:
         - ip a;
@@ -119,14 +121,14 @@
           {{- if .Values.resources.enabled }}
 {{ toYaml .Values.resources.spgwu.requests | indent 12 }}
           {{- end }}
-          {{- if .Values.networks.sriov.enabled }}
+          {{- if .Values.config.sriov.enabled }}
             intel.com/sriov_vfio: 2
           {{- end }}
           limits:
           {{- if .Values.resources.enabled }}
 {{ toYaml .Values.resources.spgwu.limits | indent 12 }}
           {{- end }}
-          {{- if .Values.networks.sriov.enabled }}
+          {{- if .Values.config.sriov.enabled }}
             intel.com/sriov_vfio: 2
           {{- end }}
         securityContext:
diff --git a/omec/omec-data-plane/values.yaml b/omec/omec-data-plane/values.yaml
new file mode 100644
index 0000000..d21f1cf
--- /dev/null
+++ b/omec/omec-data-plane/values.yaml
@@ -0,0 +1,82 @@
+# Copyright 2018-present Open Networking Foundation
+# Copyright 2018 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+images:
+  tags:
+    init: docker.io/omecproject/pod-init:0.1.0-dev
+    omecCni: docker.io/omecproject/omec-cni:0.0.1
+    sriovDp: docker.io/nfvpe/sriov-device-plugin:v3.0.0
+    spgwu: docker.io/omecproject/ngic-dp:0.1.0-dev
+    depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+  pullPolicy: IfNotPresent
+
+nodeSelectors:
+  enabled: false
+  spgwu:
+    label: omec-dp
+    value: enabled
+
+resources:
+  enabled: true
+  spgwu:
+    requests:
+      cpu: 4
+      memory: 8Gi
+    limits:
+      cpu: 4
+      memory: 8Gi
+
+config:
+  sriov:
+    enabled: true
+    resourceList:
+      - resourceName: sriov_vfio
+        selectors:
+          pfNames:
+            - eno1
+          drivers:
+            - vfio-pci
+      - resourceName: sriov_netdevice
+        selectors:
+          pfNames:
+            - eno1
+          drivers:
+            - ixgbevf
+  spgwu:
+    spgwc:
+      addr: spgwc
+      port: 21
+    # s1u and sgi interfaces are fixed to "s1u-net" and "sgi-net"
+    # Note that s1uAfDev and sgiAfDev are valid only when sriov is disabled
+    # setup-af-iface.sh script creates additional veth pair with the names here
+    s1uAfDev: s1u-veth
+    sgiAfDev: sgi-veth
+    # set "--no-pci --vdev eth_af_packet0,iface=s1u-net --vdev eth_af_packet1,iface=sgi-net"
+    # when sriov is disabled
+    devices: ""
+    rtrSgiIp: 13.1.1.254
+    sgiMask: 255.255.255.0
+
+networks:
+  cniPlugin: vfioveth
+  ipam: centralip
+  # etcdurl is required only when centralip IPAM is used
+  etcdurl: http://localhost:32379
+  s1u:
+    subnet: 119.0.0.0/24
+    gateway: 119.0.0.254
+  sgi:
+    subnet: 13.1.1.0/24
+    gateway: 13.1.1.254