diff --git a/charts/oai-5g-ran/oai-cu-cp/values.yaml b/charts/oai-5g-ran/oai-cu-cp/values.yaml
index aa5cb9f9c611a4562c056a0e38d20fa163f5c804..bfa74dd463b51661f7ee362fc55f0ebab9230b7c 100644
--- a/charts/oai-5g-ran/oai-cu-cp/values.yaml
+++ b/charts/oai-5g-ran/oai-cu-cp/values.yaml
@@ -3,8 +3,8 @@ kubernetesType: Vanilla  #Vanilla for community kubernetes distribution else Ope
 ## In case of using these charts on Openshift then please use UBI images
 ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift
 nfimage:   # image name either locally present or in a public/private repository
-  repository: @CUUP_REPO@ # docker.io/oaisoftwarealliance/oai-nr-cuup
-  version: @RAN_TAG@ # image tag or develop
+  repository: @GNB_REPO@ # docker.io/oaisoftwarealliance/oai-gnb
+  version: @GNB_TAG@ # image tag or develop
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: IfNotPresent
 
diff --git a/charts/oai-5g-ran/oai-cu-up/values.yaml b/charts/oai-5g-ran/oai-cu-up/values.yaml
index dc9ee702632b2e81007f42b20a1b370137a09f56..bfd9c44ba7a7be472ba79532accef22f2742dcea 100644
--- a/charts/oai-5g-ran/oai-cu-up/values.yaml
+++ b/charts/oai-5g-ran/oai-cu-up/values.yaml
@@ -3,8 +3,8 @@ kubernetesType: Vanilla  #Vanilla for community kubernetes distribution else Ope
 ## In case of using these charts on Openshift then please use UBI images
 ## To know more about them follow this tutorial https://gitlab.eurecom.fr/oai/cn5g/oai-cn5g-fed/-/tree/master/openshift
 nfimage:   # image name either locally present or in a public/private repository
-  repository: @GNB_CUUP_REPO@ #docker.io/oaisoftwarealliance/oai-nr-cuup           ## dockerhub oaisoftwarealliance/oai-gnb  
-  version: @GNB_CUUP_TAG@ # 2023.w49 # image tag or develop
+  repository: @CUUP_REPO@ #docker.io/oaisoftwarealliance/oai-nr-cuup           ## dockerhub oaisoftwarealliance/oai-gnb  
+  version: @RAN_TAG@ # 2023.w49 # image tag or develop
   # pullPolicy: IfNotPresent or Never or Always
   pullPolicy: IfNotPresent