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: