diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 326165d..e050585 100644
--- a/5g-control-plane/Chart.yaml
+++ b/5g-control-plane/Chart.yaml
@@ -10,7 +10,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.8.6
+version: 0.8.7
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index fd96d28..63d2fd6 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -7,18 +7,18 @@
   repository: "" #default docker hub
   tags:
     init: omecproject/pod-init:1.0.0
-    amf: omecproject/5gc-amf:master-c1a1a75
+    amf: omecproject/5gc-amf:master-40ec83b
     nrf: omecproject/5gc-nrf:master-4313faa
-    smf: omecproject/5gc-smf:master-a39c30c
+    smf: omecproject/5gc-smf:master-175785d
     ausf: omecproject/5gc-ausf:master-c84dff4
     nssf: omecproject/5gc-nssf:master-4e5aef3
     pcf: omecproject/5gc-pcf:master-bcbdeb0
     udr: omecproject/5gc-udr:master-35eb7b7
-    udm: omecproject/5gc-udm:master-a0f0671
+    udm: omecproject/5gc-udm:master-6956659
     webui: omecproject/5gc-webui:master-1121545
     sctplb: omecproject/sctplb:master-bf081d5
-    metricfunc: metricfunc:0.0.1-dev-local0
-    upfadapter: omecproject/5gc-smf:master-a39c30c
+    metricfunc: bhelankur/5gc-metricfunc:0.1.16-dev
+    upfadapter: omecproject/5gc-smf:master-175785d
   pullPolicy: IfNotPresent
 
 resources:
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index 7b0411b..34acd82 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.6.4
+version: 0.6.5
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 4f9d638..9ba3bad 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -6,7 +6,7 @@
   repository: "" #default docker hub
   tags:
     init: omecproject/pod-init:1.0.0
-    gnbsim: omecproject/5gc-gnbsim:main-0e4b557
+    gnbsim: omecproject/5gc-gnbsim:main-1caccfc
   pullPolicy: IfNotPresent
 
 nodeSelectors: