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
diff --git a/5g-ran-sim/Chart.yaml b/5g-ran-sim/Chart.yaml
index f8b2a6b..11d1aaa 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.4.8
+version: 0.4.9
diff --git a/5g-ran-sim/templates/statefulset-gnbsim.yaml b/5g-ran-sim/templates/statefulset-gnbsim.yaml
index c4fc8a7..7c2827d 100644
--- a/5g-ran-sim/templates/statefulset-gnbsim.yaml
+++ b/5g-ran-sim/templates/statefulset-gnbsim.yaml
@@ -48,7 +48,7 @@
 
       initContainers:
       - name: wait-amf-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup amf; do echo waiting for nrf; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -56,7 +56,7 @@
     {{- end }}
       containers:
       - name: gnbsim
-        image: {{ .Values.images.tags.gnbsim }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.gnbsim }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         securityContext:
           privileged: true
diff --git a/5g-ran-sim/values.yaml b/5g-ran-sim/values.yaml
index 6ce0446..8bf1721 100644
--- a/5g-ran-sim/values.yaml
+++ b/5g-ran-sim/values.yaml
@@ -3,13 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 images:
+  repository: "" #default docker hub
   tags:
-    init: docker.io/omecproject/pod-init:1.0.0
-    gnbsim: registry.aetherproject.org/omecproject/5gc-gnbsim:main-a984342
+    init: omecproject/pod-init:1.0.0
+    gnbsim: omecproject/5gc-gnbsim:main-a984342
   pullPolicy: IfNotPresent
-  # Secrets must be manually created in the namespace.
-  pullSecrets:
-    - name: aether.registry
 
 nodeSelectors:
   enabled: false
diff --git a/5g-test-apps/Chart.yaml b/5g-test-apps/Chart.yaml
index a8a984c..96f7a72 100644
--- a/5g-test-apps/Chart.yaml
+++ b/5g-test-apps/Chart.yaml
@@ -8,7 +8,7 @@
 name: 5g-test-apps
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.1.3
+version: 0.1.4
 
 dependencies:
   - name: mongodb
diff --git a/5g-test-apps/templates/deployment-dbtestapp.yaml b/5g-test-apps/templates/deployment-dbtestapp.yaml
index c349db4..517ab0e 100644
--- a/5g-test-apps/templates/deployment-dbtestapp.yaml
+++ b/5g-test-apps/templates/deployment-dbtestapp.yaml
@@ -37,7 +37,7 @@
     {{- end }}
       containers:
       - name: dbtestapp
-        image: {{ .Values.images.tags.dbtestapp }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.dbtestapp }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/5g-test-apps/values.yaml b/5g-test-apps/values.yaml
index 7e1af5a..4deaad3 100644
--- a/5g-test-apps/values.yaml
+++ b/5g-test-apps/values.yaml
@@ -3,14 +3,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 images:
+  repository: "" # default docker hub 
   tags:
-    init: docker.io/omecproject/pod-init:1.0.0
-    dbtestapp: "docker.io/osmanonf/dbtestapp:0.0.1-dev"
+    dbtestapp: "omecproject/dbtestapp:0.0.1-dev"
   pullPolicy: IfNotPresent
-  # Optionally specify an array of imagePullSecrets.
-  # Secrets must be manually created in the namespace.
-  pullSecrets:
-    - name: aether.registry
 
 mongodb:
   deploy: true
diff --git a/omec-control-plane/Chart.yaml b/omec-control-plane/Chart.yaml
index 0d98612..4024900 100644
--- a/omec-control-plane/Chart.yaml
+++ b/omec-control-plane/Chart.yaml
@@ -9,4 +9,4 @@
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.10.7
+version: 0.10.8
diff --git a/omec-control-plane/templates/statefulset-config4g.yaml b/omec-control-plane/templates/statefulset-config4g.yaml
index df3b8a7..9e3b70f 100644
--- a/omec-control-plane/templates/statefulset-config4g.yaml
+++ b/omec-control-plane/templates/statefulset-config4g.yaml
@@ -35,7 +35,7 @@
     {{- end }}
       containers:
       - name: config-4g
-        image: {{ .Values.images.tags.config4g }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.config4g }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/omec-control-plane/templates/statefulset-hss.yaml b/omec-control-plane/templates/statefulset-hss.yaml
index 1dc7e49..d002eda 100644
--- a/omec-control-plane/templates/statefulset-hss.yaml
+++ b/omec-control-plane/templates/statefulset-hss.yaml
@@ -43,7 +43,7 @@
     {{- end }}
       initContainers:
       - name: hss-bootstrap
-        image: {{ .Values.images.tags.hssdb }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.hssdb }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ["/opt/c3po/hss/scripts/hss-bootstrap.sh"]
         volumeMounts:
@@ -54,7 +54,7 @@
     {{- end }}
       containers:
       - name: hss
-        image: {{ .Values.images.tags.hss }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.hss }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/omec-control-plane/templates/statefulset-mme.yaml b/omec-control-plane/templates/statefulset-mme.yaml
index 4c7744e..ac574ce 100644
--- a/omec-control-plane/templates/statefulset-mme.yaml
+++ b/omec-control-plane/templates/statefulset-mme.yaml
@@ -39,7 +39,7 @@
     {{- end }}
       initContainers:
       - name: mme-load-sctp-module
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         securityContext:
           privileged: true
@@ -86,7 +86,7 @@
           []
     {{- end }}
       - name: mme-init
-        image: {{ .Values.images.tags.mme | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ["/opt/mme/scripts/mme-init.sh"]
         env:
@@ -106,7 +106,7 @@
     {{- end }}
       containers:
       - name: mme-app
-        image: {{ .Values.images.tags.mme | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
@@ -145,7 +145,7 @@
           mountPath: /tmp/coredump
       {{- end }}
       - name: s1ap-app
-        image: {{ .Values.images.tags.mme | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
@@ -180,7 +180,7 @@
           mountPath: /tmp/coredump
       {{- end }}
       - name: s6a-app
-        image: {{ .Values.images.tags.mme | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
@@ -213,7 +213,7 @@
           mountPath: /tmp/coredump
       {{- end }}
       - name: s11-app
-        image: {{ .Values.images.tags.mme | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.mme }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/omec-control-plane/templates/statefulset-pcrf.yaml b/omec-control-plane/templates/statefulset-pcrf.yaml
index 8fa34d8..ac7de7f 100644
--- a/omec-control-plane/templates/statefulset-pcrf.yaml
+++ b/omec-control-plane/templates/statefulset-pcrf.yaml
@@ -39,7 +39,7 @@
       serviceAccountName: pcrf
       initContainers:
       - name: pcrf-bootstrap
-        image: {{ .Values.images.tags.pcrfdb }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.pcrfdb }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ["/opt/c3po/pcrf/pcrf-bootstrap.sh"]
         volumeMounts:
@@ -50,7 +50,7 @@
     {{- end }}
       containers:
       - name: pcrf
-        image: {{ .Values.images.tags.pcrf }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.pcrf }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/omec-control-plane/templates/statefulset-spgwc.yaml b/omec-control-plane/templates/statefulset-spgwc.yaml
index 953bafa..5b8bfc3 100644
--- a/omec-control-plane/templates/statefulset-spgwc.yaml
+++ b/omec-control-plane/templates/statefulset-spgwc.yaml
@@ -43,7 +43,7 @@
     {{- end }}
       containers:
       - name: spgwc
-        image: {{ .Values.images.tags.spgwc }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.spgwc }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
@@ -112,7 +112,7 @@
           mountPath: /tmp/coredump
       {{- end }}
       - name: gx-app
-        image: {{ .Values.images.tags.spgwc }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.spgwc }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/omec-control-plane/values.yaml b/omec-control-plane/values.yaml
index c5f3e48..383a306 100644
--- a/omec-control-plane/values.yaml
+++ b/omec-control-plane/values.yaml
@@ -4,20 +4,18 @@
 # SPDX-License-Identifier: Apache-2.0
 
 images:
+  repository: "" # default docker hub
   tags:
-    init: registry.aetherproject.org/tools/busybox:stable
+    init: omecproject/busybox:stable
     depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-    hssdb: registry.aetherproject.org/proxy/omecproject/c3po-hssdb:master-df54425
-    hss: registry.aetherproject.org/proxy/omecproject/c3po-hss:master-df54425
-    mme: registry.aetherproject.org/proxy/omecproject/nucleus:master-01dc535
-    spgwc: registry.aetherproject.org/omecproject/spgw:master-96012d9
-    pcrf: registry.aetherproject.org/proxy/omecproject/c3po-pcrf:pcrf-d58dd1c
-    pcrfdb: registry.aetherproject.org/proxy/omecproject/c3po-pcrfdb:pcrf-d58dd1c
-    config4g: registry.aetherproject.org/omecproject/5gc-webui:master-4a8e10a
+    hssdb: omecproject/c3po-hssdb:master-df54425
+    hss: omecproject/c3po-hss:master-df54425
+    mme: omecproject/nucleus:master-01dc535
+    spgwc: omecproject/spgw:master-96012d9
+    pcrf: omecproject/c3po-pcrf:pcrf-d58dd1c
+    pcrfdb: omecproject/c3po-pcrfdb:pcrf-d58dd1c
+    config4g: omecproject/5gc-webui:master-7f96cfd
   pullPolicy: IfNotPresent
-  # Secrets must be manually created in the namespace.
-  pullSecrets:
-    - name: aether.registry
 
 nodeSelectors:
   enabled: false
@@ -547,6 +545,12 @@
             access-tags:
               tag1: ACC
         qos-profiles:
+          qos-profile1:
+            qci: 9
+            arp: 1
+            apn-ambr:
+              - 12345678
+              - 12345678
           mobile:
             qci: 9
             arp: 1
diff --git a/omec-sub-provision/Chart.yaml b/omec-sub-provision/Chart.yaml
index 85b826a..3f82420 100644
--- a/omec-sub-provision/Chart.yaml
+++ b/omec-sub-provision/Chart.yaml
@@ -8,4 +8,4 @@
 name: omec-sub-provision
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.4.4
+version: 0.4.5
diff --git a/omec-sub-provision/templates/deployment-simapp.yaml b/omec-sub-provision/templates/deployment-simapp.yaml
index 62c4547..2ed0840 100644
--- a/omec-sub-provision/templates/deployment-simapp.yaml
+++ b/omec-sub-provision/templates/deployment-simapp.yaml
@@ -37,7 +37,7 @@
     {{- end }}
       initContainers:
       - name: wait-simapp-module2
-        image: {{ .Values.images.tags.init | quote }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.init }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
         command: ['sh', '-c', 'until nslookup simapp; do echo waiting for simapp; sleep 4; done;']
     {{- if .Values.config.coreDump.enabled }}
@@ -45,7 +45,7 @@
     {{- end }}
       containers:
       - name: simapp
-        image: {{ .Values.images.tags.simapp }}
+        image: {{ .Values.images.repository }}{{ .Values.images.tags.simapp }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
       {{- if .Values.config.coreDump.enabled }}
         securityContext:
diff --git a/omec-sub-provision/values.yaml b/omec-sub-provision/values.yaml
index 7755f6a..268e234 100644
--- a/omec-sub-provision/values.yaml
+++ b/omec-sub-provision/values.yaml
@@ -3,14 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 images:
+  repository: "" #default docker hub
   tags:
-    init: docker.io/omecproject/pod-init:1.0.0
-    simapp: "registry.aetherproject.org/omecproject/simapp:main-2a3d85f"
+    init: omecproject/pod-init:1.0.0
+    simapp: omecproject/simapp:main-2a3d85f
   pullPolicy: IfNotPresent
-  # Optionally specify an array of imagePullSecrets.
-  # Secrets must be manually created in the namespace.
-  pullSecrets:
-    - name: aether.registry
 
 resources:
   enabled: false