diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index f07c360..c9cf659 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.6.9
+version: 0.6.10
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index 7e5830a..c677d22 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -7,10 +7,10 @@
     init: docker.io/omecproject/pod-init:1.0.0
     amf: registry.aetherproject.org/omecproject/5gc-amf:master-31437f9
     nrf: registry.aetherproject.org/omecproject/5gc-nrf:onf-release3.0.5-13304e8
-    smf: registry.aetherproject.org/omecproject/5gc-smf:master-6f2aba1
+    smf: registry.aetherproject.org/omecproject/5gc-smf:master-430fc55
     ausf: registry.aetherproject.org/omecproject/5gc-ausf:onf-release3.0.5-be7d4ac
     nssf: registry.aetherproject.org/omecproject/5gc-nssf:onf-release3.0.5-aa3a60b
-    pcf: registry.aetherproject.org/omecproject/5gc-pcf:master-dbbef99
+    pcf: registry.aetherproject.org/omecproject/5gc-pcf:master-b720a4c
     udr: registry.aetherproject.org/omecproject/5gc-udr:onf-release3.0.5-deef506
     udm: registry.aetherproject.org/omecproject/5gc-udm:onf-release3.0.5-c28433a
     webui: registry.aetherproject.org/omecproject/5gc-webui:master-4a8e10a
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index 669fea9..f8b2a6b 100644
--- a/5g-ran-sim/Chart.yaml
+++ b/5g-ran-sim/Chart.yaml
@@ -8,4 +8,4 @@
 name: 5g-ran-sim
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.4.7
+version: 0.4.8
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 34a5d49..6ce0446 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -49,7 +49,7 @@
         enabled: false
         port: 30071
     yamlCfgFiles:
-      gnb.conf: |
+      gnb.conf:
         info:
           version: 1.0.0
           description: gNodeB sim initial configuration
@@ -67,16 +67,16 @@
                   mnc: 93 # Mobile Network Code (2 or 3 digits string, digit: 0~9)
                 gNbId: 
                   bitLength: 24
-                  gNBValue: 000102 # gNB identifier (3 bytes hex string, range: 000000~FFFFFF)
+                  gNBValue: "000102" # gNB identifier (3 bytes hex string, range: 000000~FFFFFF)
               supportedTaList:
-              - tac: 000001 # Tracking Area Code (3 bytes hex string, range: 000000~FFFFFF)
+              - tac: "000001" # Tracking Area Code (3 bytes hex string, range: 000000~FFFFFF)
                 broadcastPlmnList:
                   - plmnId:
                       mcc: 208 
                       mnc: 93
                     taiSliceSupportList:
                         - sst: 1 # Slice/Service Type (uinteger, range: 0~255)
-                          sd: 010203 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
+                          sd: "010203" # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
               defaultAmf:
                 hostName: amf # Host name of AMF
                 ipAddr: # AMF IP address
@@ -87,7 +87,7 @@
               profileName: profile1 # uniqely identifies a profile within application
               enable: false # Set true to execute the profile, false otherwise.
               gnbName: gnb1 # gNB to be used for this profile
-              startImsi: 2089300007487 #First IMSI. Subsequent values will be used if ueCount is mo    re than 1
+              startImsi: 208930100007487 #First IMSI. Subsequent values will be used if ueCount is mo    re than 1
               ueCount: 5 # Number of UEs for for which the profile will be executed
               plmnId: # Public Land Mobile Network ID, <PLMN ID> = <MCC><MNC>
                 mcc: 208 # Mobile Country Code (3 digits string, digit: 0~9)
@@ -96,7 +96,7 @@
               profileName: profile2
               enable: true
               gnbName: gnb1
-              startImsi: 2089300007492
+              startImsi: 208930100007492
               ueCount: 5
               plmnId:
                 mcc: 208
@@ -106,7 +106,7 @@
               profileName: profile3
               enable: false
               gnbName: gnb1
-              startImsi: 2089300007497
+              startImsi: 208930100007497
               ueCount: 5
               plmnId:
                 mcc: 208
@@ -124,7 +124,7 @@
               profileName: profile4
               enable: false
               gnbName: gnb1
-              startImsi: 2089300007497
+              startImsi: 208930100007497
               ueCount: 5
               plmnId:
                 mcc: 208