diff --git a/omec/5g-control-plane/Chart.yaml b/omec/5g-control-plane/Chart.yaml
index edf7f23..335b49b 100644
--- a/omec/5g-control-plane/Chart.yaml
+++ b/omec/5g-control-plane/Chart.yaml
@@ -8,7 +8,7 @@
 name: 5g-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.2.20
+version: 0.2.21
 
 dependencies:
   - name: mongodb
diff --git a/omec/5g-control-plane/values.yaml b/omec/5g-control-plane/values.yaml
index aa8f4d7..78a254e 100644
--- a/omec/5g-control-plane/values.yaml
+++ b/omec/5g-control-plane/values.yaml
@@ -5,15 +5,15 @@
 images:
   tags:
     init: docker.io/omecproject/pod-init:1.0.0
-    amf: registry.aetherproject.org/omecproject/5gc-amf:onf-release3.0.5-latest
-    nrf: registry.aetherproject.org/omecproject/5gc-nrf:onf-release3.0.5-latest
-    smf: registry.aetherproject.org/omecproject/5gc-smf:onf-release3.0.5-latest
-    ausf: registry.aetherproject.org/omecproject/5gc-ausf:onf-release3.0.5-latest
-    nssf: registry.aetherproject.org/omecproject/5gc-nssf:onf-release3.0.5-latest
-    pcf: registry.aetherproject.org/omecproject/5gc-pcf:onf-release3.0.5-latest
-    udr: registry.aetherproject.org/omecproject/5gc-udr:onf-release3.0.5-latest
-    udm: registry.aetherproject.org/omecproject/5gc-udm:onf-release3.0.5-latest
-    webui: registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-latest
+    amf: registry.aetherproject.org/omecproject/5gc-amf:onf-release3.0.5-921b890
+    nrf: registry.aetherproject.org/omecproject/5gc-nrf:onf-release3.0.5-3471442
+    smf: registry.aetherproject.org/omecproject/5gc-smf:onf-release3.0.5-e991983
+    ausf: registry.aetherproject.org/omecproject/5gc-ausf:onf-release3.0.5-85ea075
+    nssf: registry.aetherproject.org/omecproject/5gc-nssf:onf-release3.0.5-c372b24
+    pcf: registry.aetherproject.org/omecproject/5gc-pcf:onf-release3.0.5-95ae49f
+    udr: registry.aetherproject.org/omecproject/5gc-udr:onf-release3.0.5-bc3b287
+    udm: registry.aetherproject.org/omecproject/5gc-udm:onf-release3.0.5-40055e8
+    webui: registry.aetherproject.org/omecproject/5gc-webui:onf-release3.0.5-bf0b54f
   pullPolicy: IfNotPresent
   # Optionally specify an array of imagePullSecrets.
   # Secrets must be manually created in the namespace.