diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index 1d8af80..ba2eccf 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -15,7 +15,8 @@
 # limitations under the License.
 
 apiVersion: v1
-appVersion: "1.0"
 description: OMEC control plane services
 name: omec-control-plane
-version: 0.1.9
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 0.1.11
diff --git a/omec/omec-control-plane/templates/_helpers.tpl b/omec/omec-control-plane/templates/_helpers.tpl
index 223a933..53bd471 100644
--- a/omec/omec-control-plane/templates/_helpers.tpl
+++ b/omec/omec-control-plane/templates/_helpers.tpl
@@ -44,9 +44,9 @@
 {{- $type := index . 1 -}}
 {{- $context := index . 2 -}}
 {{- if eq $type "identity" -}}
-{{- printf "%s-s6a.%s.svc.%s" $service $context.Release.Namespace "cluster.local" -}}
+{{- printf "%s-s6a.%s.svc.%s" $service $context.Release.Namespace $context.Values.config.clusterDomain -}}
 {{- else if eq $type "realm" -}}
-{{- printf "%s.svc.%s" $context.Release.Namespace "cluster.local" -}}
+{{- printf "%s.svc.%s" $context.Release.Namespace $context.Values.config.clusterDomain -}}
 {{- else if eq $type "host" -}}
 {{- printf "%s-s6a" $service -}}
 {{- end -}}
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 7f6da5d..21f88f1 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -86,6 +86,7 @@
     #  cpu: 2
 
 config:
+  clusterDomain: cluster.local
   hss:
     hssdb: cassandra
     s6a:
diff --git a/omec/omec-data-plane-cni/Chart.yaml b/omec/omec-data-plane-cni/Chart.yaml
index 154abd9..89ce295 100644
--- a/omec/omec-data-plane-cni/Chart.yaml
+++ b/omec/omec-data-plane-cni/Chart.yaml
@@ -16,4 +16,6 @@
 apiVersion: v1
 description: CNI setup for OMEC data plane
 name: omec-data-plane-cni
-version: 1.0.0
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 1.0.1
diff --git a/omec/omec-data-plane/Chart.yaml b/omec/omec-data-plane/Chart.yaml
index 11ea877..21f163a 100644
--- a/omec/omec-data-plane/Chart.yaml
+++ b/omec/omec-data-plane/Chart.yaml
@@ -17,4 +17,6 @@
 apiVersion: v1
 description: OMEC data plane services
 name: omec-data-plane
-version: 0.1.5
+icon: https://guide.opencord.org/logos/cord.svg
+
+version: 0.1.6