diff --git a/5g-control-plane/Chart.yaml b/5g-control-plane/Chart.yaml
index 6e16047..34481f6 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.11
+version: 0.6.13
 
 dependencies:
   - name: mongodb
diff --git a/5g-control-plane/templates/deployment-amf.yaml b/5g-control-plane/templates/deployment-amf.yaml
index a7f7a65..3855b63 100644
--- a/5g-control-plane/templates/deployment-amf.yaml
+++ b/5g-control-plane/templates/deployment-amf.yaml
@@ -34,7 +34,7 @@
     {{- end }}
       initContainers:
       - name: wait-nrf-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup nrf; do echo waiting for nrf; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -42,7 +42,7 @@
     {{- end }}
       containers:
       - name: amf
-        image: {{ .Values.images.tags.amf }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.amf }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-ausf.yaml b/5g-control-plane/templates/deployment-ausf.yaml
index 5ffea55..da8fcfa 100644
--- a/5g-control-plane/templates/deployment-ausf.yaml
+++ b/5g-control-plane/templates/deployment-ausf.yaml
@@ -37,7 +37,7 @@
     {{- end }}
       initContainers:
       - name: wait-ausf-module2
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup ausf; do echo waiting for ausf; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -45,7 +45,7 @@
     {{- end }}
       containers:
       - name: ausf
-        image: {{ .Values.images.tags.ausf }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.ausf }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-nrf.yaml b/5g-control-plane/templates/deployment-nrf.yaml
index c325cff..d377920 100644
--- a/5g-control-plane/templates/deployment-nrf.yaml
+++ b/5g-control-plane/templates/deployment-nrf.yaml
@@ -41,7 +41,7 @@
     {{- end }}
       containers:
       - name: nrf
-        image: {{ .Values.images.tags.nrf }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.nrf }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-nssf.yaml b/5g-control-plane/templates/deployment-nssf.yaml
index 7dbdb9c..a5f3061 100644
--- a/5g-control-plane/templates/deployment-nssf.yaml
+++ b/5g-control-plane/templates/deployment-nssf.yaml
@@ -35,7 +35,7 @@
     {{- end }}
       initContainers:
       - name: wait-nssf-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup nssf; do echo waiting for nssf; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -43,7 +43,7 @@
     {{- end }}
       containers:
       - name: nssf
-        image: {{ .Values.images.tags.nssf }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.nssf }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-pcf.yaml b/5g-control-plane/templates/deployment-pcf.yaml
index 1139de3..67e6c2f 100644
--- a/5g-control-plane/templates/deployment-pcf.yaml
+++ b/5g-control-plane/templates/deployment-pcf.yaml
@@ -35,7 +35,7 @@
     {{- end }}
       initContainers:
       - name: wait-pcf-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup pcf; do echo waiting for pcf; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -43,7 +43,7 @@
     {{- end }}
       containers:
       - name: pcf
-        image: {{ .Values.images.tags.pcf }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.pcf }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-smf.yaml b/5g-control-plane/templates/deployment-smf.yaml
index 6de7ccc..6b9dce0 100644
--- a/5g-control-plane/templates/deployment-smf.yaml
+++ b/5g-control-plane/templates/deployment-smf.yaml
@@ -37,7 +37,7 @@
     {{- end }}
       initContainers:
       - name: wait-smf-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup smf; do echo waiting for smf; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -45,7 +45,7 @@
     {{- end }}
       containers:
       - name: smf
-        image: {{ .Values.images.tags.smf }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.smf }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-udm.yaml b/5g-control-plane/templates/deployment-udm.yaml
index 01492a8..30062bf 100644
--- a/5g-control-plane/templates/deployment-udm.yaml
+++ b/5g-control-plane/templates/deployment-udm.yaml
@@ -35,11 +35,11 @@
     {{- end }}
       initContainers:
       - name: wait-udm-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup udm; do echo waiting for udm; sleep 4; done;']
       - name: wait-udr-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup udr; do echo waiting for udr; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -47,7 +47,7 @@
     {{- end }}
       containers:
       - name: udm
-        image: {{ .Values.images.tags.udm }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.udm }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-udr.yaml b/5g-control-plane/templates/deployment-udr.yaml
index a4d4eb1..81b914c 100644
--- a/5g-control-plane/templates/deployment-udr.yaml
+++ b/5g-control-plane/templates/deployment-udr.yaml
@@ -35,7 +35,7 @@
     {{- end }}
       initContainers:
       - name: wait-udr-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup udr; do echo waiting for udr; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -43,7 +43,7 @@
     {{- end }}
       containers:
       - name: udr
-        image: {{ .Values.images.tags.udr }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.udr }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-control-plane/templates/deployment-webui.yaml b/5g-control-plane/templates/deployment-webui.yaml
index 5aebec2..f023a13 100644
--- a/5g-control-plane/templates/deployment-webui.yaml
+++ b/5g-control-plane/templates/deployment-webui.yaml
@@ -34,7 +34,7 @@
     {{- end }}
       initContainers:
       - name: wait-webui-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup webui; do echo waiting for webui; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -42,7 +42,7 @@
     {{- end }}
       containers:
       - name: webui
-        image: {{ .Values.images.tags.webui }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.webui }}
         env:
         - name: GRPC_GO_LOG_VERBOSITY_LEVEL
           value: {{ .Values.config.grpc.golog_verbosity | quote }}
diff --git a/5g-control-plane/values.yaml b/5g-control-plane/values.yaml
index 85aa5ab..36dd83b 100644
--- a/5g-control-plane/values.yaml
+++ b/5g-control-plane/values.yaml
@@ -3,28 +3,25 @@
 # SPDX-License-Identifier: Apache-2.0
 
 images:
+  repository: "" #default docker hub
   tags:
-    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-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-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
+    init: omecproject/pod-init:1.0.0
+    amf: omecproject/5gc-amf:master-4e0656a
+    nrf: omecproject/5gc-nrf:master-3768767
+    smf: omecproject/5gc-smf:master-d14a4c9
+    ausf: omecproject/5gc-ausf:master-97794b4
+    nssf: omecproject/5gc-nssf:master-0e9b742
+    pcf: omecproject/5gc-pcf:master-b720a4c
+    udr: omecproject/5gc-udr:master-f020ef3
+    udm: omecproject/5gc-udm:master-bd72757
+    webui: omecproject/5gc-webui:master-7f96cfd
   pullPolicy: IfNotPresent
-  # Optionally specify an array of imagePullSecrets.
-  # Secrets must be manually created in the namespace.
-  pullSecrets:
-    - name: aether.registry
 
 resources:
   enabled: false
   amf:
     requests:
-      cpu: 2
+      cpu: 3
       memory: 1Gi
     limits:
       cpu: 2