diff --git a/sdcore-helm-charts/Chart.yaml b/sdcore-helm-charts/Chart.yaml
index 039f6f4..4051dd8 100644
--- a/sdcore-helm-charts/Chart.yaml
+++ b/sdcore-helm-charts/Chart.yaml
@@ -8,7 +8,7 @@
 description: SD-Core control plane services
 icon: https://guide.opencord.org/logos/cord.svg
 type: application
-version: 0.5.2
+version: 0.5.3
 home: https://opennetworking.org/sd-core/
 maintainers:
   - name: SD-Core Support
diff --git a/sdcore-helm-charts/values.yaml b/sdcore-helm-charts/values.yaml
index 500fdf4..ed7c62f 100644
--- a/sdcore-helm-charts/values.yaml
+++ b/sdcore-helm-charts/values.yaml
@@ -7,46 +7,54 @@
 # Declare variables to be passed into your templates.
 
 #Images tagged for the release
-images:
-  tags:
-    #4G control Plane images
-    init: docker.io/omecproject/pod-init:1.0.0
-    hssdb: registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-22ccd06
-    hss: registry.aetherproject.org/proxy/omecproject/c3po-hss:master-22ccd06
-    mme: registry.aetherproject.org/proxy/omecproject/nucleus:master-9f86f87
-    spgwc: registry.aetherproject.org/omecproject/spgw:master-d8b0987
-    pcrf: registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-7824e6e
-    pcrfdb: registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-7824e6e
-    config4g: registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-c22caf8
-    depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-
-    #4G/5G user plane images
-    bess: registry.aetherproject.org/proxy/omecproject/upf-epc-bess:master-de36ff8
-    pfcpiface: registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-de36ff8
-
-    simapp: registry.aetherproject.org/proxy/omecproject/simapp:main-aa6dae9
-
-    #5G NF images
-    webui: registry.aetherproject.org/proxy/omecproject/5gc-webui:onf-release3.0.5-bf7e6f6
-    amf: registry.aetherproject.org/proxy/omecproject/5gc-amf:onf-release3.0.5-c43b11d
-    smf: registry.aetherproject.org/proxy/omecproject/5gc-smf:onf-release3.0.5-b62c8e5
-    pcf: registry.aetherproject.org/proxy/omecproject/5gc-pcf:onf-release3.0.5-417ce9f
-    ausf: registry.aetherproject.org/proxy/omecproject/5gc-ausf:onf-release3.0.5-acbcb29
-    nrf: registry.aetherproject.org/proxy/omecproject/5gc-nrf:onf-release3.0.5-c40a6c5
-    nssf: registry.aetherproject.org/proxy/omecproject/5gc-nssf:onf-release3.0.5-ad7235e
-    udr: registry.aetherproject.org/proxy/omecproject/5gc-udr:onf-release3.0.5-e295a76
-    udm: registry.aetherproject.org/proxy/omecproject/5gc-udm:onf-release3.0.5-ea3ef93
-
 omec-control-plane:
   enable4G: false
+  images:
+    tags:
+      #4G control Plane images
+      init: docker.io/omecproject/pod-init:1.0.0
+      hssdb: registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-22ccd06
+      hss: registry.aetherproject.org/proxy/omecproject/c3po-hss:master-22ccd06
+      mme: registry.aetherproject.org/proxy/omecproject/nucleus:master-9f86f87
+      spgwc: registry.aetherproject.org/omecproject/spgw:master-d8b0987
+      pcrf: registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-7824e6e
+      pcrfdb: registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-7824e6e
+      config4g: registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-c22caf8
+      depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+  config:
+    config4g:
+      deploy: true
+
+omec-user-plane:
+  images:
+    tags:
+      #4G/5G user plane images
+      bess: registry.aetherproject.org/proxy/omecproject/upf-epc-bess:master-de36ff8
+      pfcpiface: registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-de36ff8
+  config:
+    upf:
+      cfgFiles:
+        upf.json:
+          cpiface:
+            dnn: "8internet"
+            hostname: "upf"
+
+omec-sub-provision:
+  images:
+    tags:
+      simapp: registry.aetherproject.org/omecproject/simapp:main-aa6dae9
+
 5g-control-plane:
   enable5G: true
-config:
-  config4g:
-    deploy: true
-  upf:
-    cfgFiles:
-      upf.json:
-        cpiface:
-          dnn: "8internet"
-          hostname: "upf"
+  images:
+    tags:
+      #5G NF images
+      webui: registry.aetherproject.org/proxy/omecproject/5gc-webui:onf-release3.0.5-bf7e6f6
+      amf: registry.aetherproject.org/proxy/omecproject/5gc-amf:onf-release3.0.5-c43b11d
+      smf: registry.aetherproject.org/proxy/omecproject/5gc-smf:onf-release3.0.5-b62c8e5
+      pcf: registry.aetherproject.org/proxy/omecproject/5gc-pcf:onf-release3.0.5-417ce9f
+      ausf: registry.aetherproject.org/proxy/omecproject/5gc-ausf:onf-release3.0.5-acbcb29
+      nrf: registry.aetherproject.org/proxy/omecproject/5gc-nrf:onf-release3.0.5-c40a6c5
+      nssf: registry.aetherproject.org/proxy/omecproject/5gc-nssf:onf-release3.0.5-ad7235e
+      udr: registry.aetherproject.org/proxy/omecproject/5gc-udr:onf-release3.0.5-e295a76
+      udm: registry.aetherproject.org/proxy/omecproject/5gc-udm:onf-release3.0.5-ea3ef93