diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index e050585..bad852b 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.7
+version: 0.8.8
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index 63d2fd6..7565b6c 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -9,7 +9,7 @@
     init: omecproject/pod-init:1.0.0
     amf: omecproject/5gc-amf:master-40ec83b
     nrf: omecproject/5gc-nrf:master-4313faa
-    smf: omecproject/5gc-smf:master-175785d
+    smf: omecproject/5gc-smf:master-6451e24
     ausf: omecproject/5gc-ausf:master-c84dff4
     nssf: omecproject/5gc-nssf:master-4e5aef3
     pcf: omecproject/5gc-pcf:master-bcbdeb0
@@ -17,8 +17,8 @@
     udm: omecproject/5gc-udm:master-6956659
     webui: omecproject/5gc-webui:master-1121545
     sctplb: omecproject/sctplb:master-bf081d5
-    metricfunc: bhelankur/5gc-metricfunc:0.1.16-dev
-    upfadapter: omecproject/5gc-smf:master-175785d
+    metricfunc: omecproject/metricfunc:main-41ae987
+    upfadapter: omecproject/5gc-smf:master-6451e24
   pullPolicy: IfNotPresent
 
 resources: