diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index c37467f..30deccb 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -1,5 +1,4 @@
 ---
-
 # Copyright 2018 Intel Corporation
 # Copyright 2018-present Open Networking Foundation
 #
@@ -11,4 +10,4 @@
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.2.2
+version: 0.2.3
diff --git a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
index 469424d..443b3c2 100644
--- a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
@@ -90,10 +90,10 @@
     {{ .count }} \
     {{ .imsiStart }} \
     {{ .msisdnStart }} \
-    {{ $.Values.config.hss.bootstrap.apn }} \
-    {{ $.Values.config.hss.bootstrap.key }} \
-    {{ $.Values.config.hss.bootstrap.opc }} \
-    {{ $.Values.config.hss.bootstrap.sqn }} \
+    {{ .apn }} \
+    {{ .key }} \
+    {{ .opc }} \
+    {{ .sqn }} \
     {{ $.Values.config.hss.hssdb }} \
     $mme_identity \
     $mme_realm
@@ -103,10 +103,10 @@
 provision_staticusers \
     {{ .imsi }} \
     {{ .msisdn }} \
-    {{ $.Values.config.hss.bootstrap.apn }} \
-    {{ $.Values.config.hss.bootstrap.key }} \
-    {{ $.Values.config.hss.bootstrap.opc }} \
-    {{ $.Values.config.hss.bootstrap.sqn }} \
+    {{ .apn }} \
+    {{ .key }} \
+    {{ .opc }} \
+    {{ .sqn }} \
     {{ $.Values.config.hss.hssdb }} \
     $mme_identity \
     $mme_realm \
diff --git a/omec/omec-control-plane/values.yaml b/omec/omec-control-plane/values.yaml
index 46531e6..a0761fc 100644
--- a/omec/omec-control-plane/values.yaml
+++ b/omec/omec-control-plane/values.yaml
@@ -98,12 +98,12 @@
       #ipSec:
     bootstrap:
       enabled: true
-      apn: internet
-      key: "465b5ce8b199b49faa5f0a2ee238a6bc"
-      opc: "d4416644f6154936193433dd20a0ace0"
-      sqn: 96
       users:
-        - imsiStart: "208014567891200"
+        - apn: internet
+          key: "465b5ce8b199b49faa5f0a2ee238a6bc"
+          opc: "d4416644f6154936193433dd20a0ace0"
+          sqn: 96
+          imsiStart: "208014567891200"
           msisdnStart: "1122334455"
           count: 10
       mmes: