diff --git a/charts/backend/charts/android-app-k8s/templates/deployment.yaml b/charts/backend/charts/android-app-k8s/templates/deployment.yaml
index 7c616bb..a4e693d 100755
--- a/charts/backend/charts/android-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/android-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -50,7 +50,7 @@ spec:
               fi
       containers:
         - name: android-sender
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/android-app-k8s/values.yaml b/charts/backend/charts/android-app-k8s/values.yaml
index f1344e8..f7ba9b3 100755
--- a/charts/backend/charts/android-app-k8s/values.yaml
+++ b/charts/backend/charts/android-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/android-sender-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/auth-app-k8s/templates/deployment.yaml b/charts/backend/charts/auth-app-k8s/templates/deployment.yaml
index c398517..2ab4347 100755
--- a/charts/backend/charts/auth-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/auth-app-k8s/templates/deployment.yaml
@@ -34,7 +34,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -54,7 +54,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: auth-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.service.targetPort }}
diff --git a/charts/backend/charts/auth-app-k8s/values.yaml b/charts/backend/charts/auth-app-k8s/values.yaml
index 3289564..e54e1e0 100755
--- a/charts/backend/charts/auth-app-k8s/values.yaml
+++ b/charts/backend/charts/auth-app-k8s/values.yaml
@@ -2,7 +2,6 @@
 fullnameOverride: "auth-app"
 
 image:
-  repository: docker.ii-p001.local/auth-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/auth-event-handler-app-k8s/values.yaml b/charts/backend/charts/auth-event-handler-app-k8s/values.yaml
index 8f05c27..e10cbc3 100755
--- a/charts/backend/charts/auth-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/auth-event-handler-app-k8s/values.yaml
@@ -1,6 +1,5 @@
 fullnameOverride: "auth-event-handler-app" 
 image:
-  repository: docker.ii-p001.local/auth-event-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/bff-app-k8s/templates/deployment.yaml b/charts/backend/charts/bff-app-k8s/templates/deployment.yaml
index 39b9aab..15c741a 100755
--- a/charts/backend/charts/bff-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/bff-app-k8s/templates/deployment.yaml
@@ -48,7 +48,7 @@ spec:
 #                -keystore /tmp/cacerts/cacerts
       containers:
         - name: bff-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.service.targetPort }}
diff --git a/charts/backend/charts/bff-app-k8s/values.yaml b/charts/backend/charts/bff-app-k8s/values.yaml
index 62054b8..d36b4ff 100755
--- a/charts/backend/charts/bff-app-k8s/values.yaml
+++ b/charts/backend/charts/bff-app-k8s/values.yaml
@@ -1,5 +1,4 @@
 image:
-  repository: docker.ii-p001.local/bff-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/bff-vcs-app-k8s/templates/deployment.yaml b/charts/backend/charts/bff-vcs-app-k8s/templates/deployment.yaml
index 8bb94d5..9e6c3d2 100755
--- a/charts/backend/charts/bff-vcs-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/bff-vcs-app-k8s/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
 #                -keystore /tmp/cacerts/cacerts
       containers:
         - name: bff-vcs-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: GRPC_CLIENT_CALL_URL
diff --git a/charts/backend/charts/bff-vcs-app-k8s/values.yaml b/charts/backend/charts/bff-vcs-app-k8s/values.yaml
index 8fb4ed9..1c1f4b9 100755
--- a/charts/backend/charts/bff-vcs-app-k8s/values.yaml
+++ b/charts/backend/charts/bff-vcs-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/bff-vcs-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/big-chat-splitter-app-k8s/templates/deployment.yaml b/charts/backend/charts/big-chat-splitter-app-k8s/templates/deployment.yaml
index 617d56d..e9d3e44 100755
--- a/charts/backend/charts/big-chat-splitter-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/big-chat-splitter-app-k8s/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -47,7 +47,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: big-chat-splitter-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/big-chat-splitter-app-k8s/values.yaml b/charts/backend/charts/big-chat-splitter-app-k8s/values.yaml
index 0f894c4..f932636 100755
--- a/charts/backend/charts/big-chat-splitter-app-k8s/values.yaml
+++ b/charts/backend/charts/big-chat-splitter-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 
 fullnameOverride: "big-chat-splitter-app"
 image:
-  repository: docker.ii-p001.local/big-chat-splitter-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 replicaCount: 1
diff --git a/charts/backend/charts/call-app-k8s/templates/deployment.yaml b/charts/backend/charts/call-app-k8s/templates/deployment.yaml
index 7f7f50a..9294b91 100755
--- a/charts/backend/charts/call-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/call-app-k8s/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -48,7 +48,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: call-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 5005
diff --git a/charts/backend/charts/call-app-k8s/values.yaml b/charts/backend/charts/call-app-k8s/values.yaml
index 66b9bac..a06a358 100755
--- a/charts/backend/charts/call-app-k8s/values.yaml
+++ b/charts/backend/charts/call-app-k8s/values.yaml
@@ -1,5 +1,4 @@
 image:
-  repository: docker.ii-p001.local/call-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/call-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/call-event-handler-app-k8s/templates/deployment.yaml
index 994a585..ce391a4 100755
--- a/charts/backend/charts/call-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/call-event-handler-app-k8s/templates/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -50,7 +50,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 5005
diff --git a/charts/backend/charts/call-event-handler-app-k8s/values.yaml b/charts/backend/charts/call-event-handler-app-k8s/values.yaml
index f83bf5a..6780a93 100755
--- a/charts/backend/charts/call-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/call-event-handler-app-k8s/values.yaml
@@ -1,5 +1,4 @@
 image:
-  repository: docker.ii-p001.local/call-event-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/call-realtime-app-k8s/templates/deployment.yaml b/charts/backend/charts/call-realtime-app-k8s/templates/deployment.yaml
index f4032a6..6be8811 100755
--- a/charts/backend/charts/call-realtime-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/call-realtime-app-k8s/templates/deployment.yaml
@@ -30,7 +30,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -50,7 +50,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 5005
diff --git a/charts/backend/charts/call-realtime-app-k8s/values.yaml b/charts/backend/charts/call-realtime-app-k8s/values.yaml
index 4cd496c..4750bb8 100755
--- a/charts/backend/charts/call-realtime-app-k8s/values.yaml
+++ b/charts/backend/charts/call-realtime-app-k8s/values.yaml
@@ -1,6 +1,5 @@
 # Image Configuration
 image:
-  repository: docker.ii-p001.local/call-realtime-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/chat-app-k8s/templates/deployment.yaml b/charts/backend/charts/chat-app-k8s/templates/deployment.yaml
index 23be3fa..8777861 100755
--- a/charts/backend/charts/chat-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/chat-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/chat-app-k8s/values.yaml b/charts/backend/charts/chat-app-k8s/values.yaml
index 3811d8e..f71c631 100755
--- a/charts/backend/charts/chat-app-k8s/values.yaml
+++ b/charts/backend/charts/chat-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/chat-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/chat-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/chat-event-handler-app-k8s/templates/deployment.yaml
index eb013e5..68d09c1 100755
--- a/charts/backend/charts/chat-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/chat-event-handler-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 5005
diff --git a/charts/backend/charts/chat-event-handler-app-k8s/values.yaml b/charts/backend/charts/chat-event-handler-app-k8s/values.yaml
index 3b04b6b..6ff02cb 100755
--- a/charts/backend/charts/chat-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/chat-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/chat-event-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/deeplink-app-k8s/templates/deployment.yaml b/charts/backend/charts/deeplink-app-k8s/templates/deployment.yaml
index 28ad211..0ac6082 100755
--- a/charts/backend/charts/deeplink-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/deeplink-app-k8s/templates/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: {{ include "deeplink-app.name" . }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           ports:
             - containerPort: {{ .Values.container.port }}
               protocol: TCP
diff --git a/charts/backend/charts/deeplink-app-k8s/values.yaml b/charts/backend/charts/deeplink-app-k8s/values.yaml
index b3d11d9..dc832fc 100755
--- a/charts/backend/charts/deeplink-app-k8s/values.yaml
+++ b/charts/backend/charts/deeplink-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/deeplink-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
   
diff --git a/charts/backend/charts/devices-app-k8s/templates/deployment.yaml b/charts/backend/charts/devices-app-k8s/templates/deployment.yaml
index 996902b..6fdcced 100755
--- a/charts/backend/charts/devices-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/devices-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/devices-app-k8s/values.yaml b/charts/backend/charts/devices-app-k8s/values.yaml
index 68f5c02..96d2771 100755
--- a/charts/backend/charts/devices-app-k8s/values.yaml
+++ b/charts/backend/charts/devices-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/device-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/gem-call-app-k8s/templates/deployment.yaml b/charts/backend/charts/gem-call-app-k8s/templates/deployment.yaml
index 745723f..5e65827 100755
--- a/charts/backend/charts/gem-call-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/gem-call-app-k8s/templates/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: {{ include "gem-call-app.name" . }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/gem-call-app-k8s/values.yaml b/charts/backend/charts/gem-call-app-k8s/values.yaml
index 6b8338c..d4d906b 100755
--- a/charts/backend/charts/gem-call-app-k8s/values.yaml
+++ b/charts/backend/charts/gem-call-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/gem-call-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/gem-call-events-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/gem-call-events-handler-app-k8s/templates/deployment.yaml
index 066e0af..d958b31 100755
--- a/charts/backend/charts/gem-call-events-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/gem-call-events-handler-app-k8s/templates/deployment.yaml
@@ -27,7 +27,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -47,7 +47,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: gem-call-events-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
             {{- include "global.env.kafka" . | nindent 12 }}
diff --git a/charts/backend/charts/gem-call-events-handler-app-k8s/values.yaml b/charts/backend/charts/gem-call-events-handler-app-k8s/values.yaml
index a5cf852..1d961a9 100755
--- a/charts/backend/charts/gem-call-events-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/gem-call-events-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: "docker.ii-p001.local/gem-call-events-handler-app"
   tag: "1.0.0-SNAPSHOT"
   pullPolicy: Always
 
diff --git a/charts/backend/charts/huawei-app-k8s/templates/deployment.yaml b/charts/backend/charts/huawei-app-k8s/templates/deployment.yaml
index ec9481d..65b35fb 100755
--- a/charts/backend/charts/huawei-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/huawei-app-k8s/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -53,7 +53,7 @@ spec:
               fi
       containers:
         - name: huawei-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/huawei-app-k8s/values.yaml b/charts/backend/charts/huawei-app-k8s/values.yaml
index 7f583b0..d904f1f 100755
--- a/charts/backend/charts/huawei-app-k8s/values.yaml
+++ b/charts/backend/charts/huawei-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/huawei-sender-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/ios-app-k8s/templates/deployment.yaml b/charts/backend/charts/ios-app-k8s/templates/deployment.yaml
index bc8b7e6..d81f6fc 100755
--- a/charts/backend/charts/ios-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/ios-app-k8s/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -51,7 +51,7 @@ spec:
               fi
       containers:
         - name: ios-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/ios-app-k8s/values.yaml b/charts/backend/charts/ios-app-k8s/values.yaml
index 734c952..252d0ec 100755
--- a/charts/backend/charts/ios-app-k8s/values.yaml
+++ b/charts/backend/charts/ios-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/ios-sender-app
   tag: "1.0.0-SNAPSHOT"
   pullPolicy: Always
 
diff --git a/charts/backend/charts/license-app-k8s/templates/deployment.yaml b/charts/backend/charts/license-app-k8s/templates/deployment.yaml
index 0c0679a..cfb5fdd 100755
--- a/charts/backend/charts/license-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/license-app-k8s/templates/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: license-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 8080
diff --git a/charts/backend/charts/license-app-k8s/values.yaml b/charts/backend/charts/license-app-k8s/values.yaml
index 54bb0e0..0320ceb 100755
--- a/charts/backend/charts/license-app-k8s/values.yaml
+++ b/charts/backend/charts/license-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/license-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/livekit-webhook-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/livekit-webhook-handler-app-k8s/templates/deployment.yaml
index be78c01..1371932 100755
--- a/charts/backend/charts/livekit-webhook-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/livekit-webhook-handler-app-k8s/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -51,7 +51,7 @@ spec:
               fi
       containers:
         - name: livekit-webhook-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.service.targetPort }}
diff --git a/charts/backend/charts/livekit-webhook-handler-app-k8s/values.yaml b/charts/backend/charts/livekit-webhook-handler-app-k8s/values.yaml
index af948aa..34b5c88 100755
--- a/charts/backend/charts/livekit-webhook-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/livekit-webhook-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/livekit-webhook-handler-app
   tag: "1.0.0-SNAPSHOT"
   pullPolicy: Always
 
diff --git a/charts/backend/charts/message-app-k8s/templates/deployment.yaml b/charts/backend/charts/message-app-k8s/templates/deployment.yaml
index f6c26e4..eb89723 100755
--- a/charts/backend/charts/message-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/message-app-k8s/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -46,7 +46,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: message-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           ports:
             - containerPort: {{ .Values.service.targetPort }}
               protocol: TCP
diff --git a/charts/backend/charts/message-app-k8s/values.yaml b/charts/backend/charts/message-app-k8s/values.yaml
index 5f86cc9..e334c00 100755
--- a/charts/backend/charts/message-app-k8s/values.yaml
+++ b/charts/backend/charts/message-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/message-app
   tag: "1.0.0-SNAPSHOT"
   pullPolicy: Always
 
diff --git a/charts/backend/charts/message-call-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/message-call-event-handler-app-k8s/templates/deployment.yaml
index 70801d1..c8052fd 100755
--- a/charts/backend/charts/message-call-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/message-call-event-handler-app-k8s/templates/deployment.yaml
@@ -26,7 +26,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -51,7 +51,7 @@ spec:
               fi
       containers:
         - name: message-call-event-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           ports:
             - containerPort: 9090
               hostPort: 8086
diff --git a/charts/backend/charts/message-call-event-handler-app-k8s/values.yaml b/charts/backend/charts/message-call-event-handler-app-k8s/values.yaml
index 2be2ad6..9c702fe 100755
--- a/charts/backend/charts/message-call-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/message-call-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/message-call-event-handler-app
   tag: "1.0.0-SNAPSHOT"
   pullPolicy: Always
 
diff --git a/charts/backend/charts/message-chat-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/message-chat-event-handler-app-k8s/templates/deployment.yaml
index 8d02677..b2ab997 100755
--- a/charts/backend/charts/message-chat-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/message-chat-event-handler-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: message-chat-event-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           ports:
             - containerPort: 9090
               hostPort: 8086
diff --git a/charts/backend/charts/message-chat-event-handler-app-k8s/values.yaml b/charts/backend/charts/message-chat-event-handler-app-k8s/values.yaml
index d9093af..4708256 100755
--- a/charts/backend/charts/message-chat-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/message-chat-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/message-chat-event-handler-app
   tag: "1.0.0-SNAPSHOT"
   pullPolicy: Always
 
diff --git a/charts/backend/charts/message-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/message-event-handler-app-k8s/templates/deployment.yaml
index 0cdbd65..296d2a2 100755
--- a/charts/backend/charts/message-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/message-event-handler-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -50,7 +50,7 @@ spec:
               fi
       containers:
         - name: message-event-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/message-event-handler-app-k8s/values.yaml b/charts/backend/charts/message-event-handler-app-k8s/values.yaml
index 608d848..9619c33 100755
--- a/charts/backend/charts/message-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/message-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/message-event-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/message-link-preview-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/message-link-preview-handler-app-k8s/templates/deployment.yaml
index 6ffb2e1..92746b2 100755
--- a/charts/backend/charts/message-link-preview-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/message-link-preview-handler-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -50,7 +50,7 @@ spec:
               fi
       containers:
         - name: message-link-preview-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/message-link-preview-handler-app-k8s/values.yaml b/charts/backend/charts/message-link-preview-handler-app-k8s/values.yaml
index 827bf4b..fa564ef 100755
--- a/charts/backend/charts/message-link-preview-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/message-link-preview-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/message-link-preview-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/message-user-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/message-user-event-handler-app-k8s/templates/deployment.yaml
index 2b9e6d5..9575191 100755
--- a/charts/backend/charts/message-user-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/message-user-event-handler-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: message-user-event-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/message-user-event-handler-app-k8s/values.yaml b/charts/backend/charts/message-user-event-handler-app-k8s/values.yaml
index 0f413af..cf59896 100755
--- a/charts/backend/charts/message-user-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/message-user-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/message-user-event-handler-app
   pullPolicy: Always
   tag: 1.0.0-SNAPSHOT
 
diff --git a/charts/backend/charts/notification-app-k8s/templates/deployment.yaml b/charts/backend/charts/notification-app-k8s/templates/deployment.yaml
index 6f18ffc..3e4b308 100755
--- a/charts/backend/charts/notification-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/notification-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: notification-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: {{ .Values.service.targetPort }}
diff --git a/charts/backend/charts/notification-app-k8s/values.yaml b/charts/backend/charts/notification-app-k8s/values.yaml
index bc97597..c1827e6 100755
--- a/charts/backend/charts/notification-app-k8s/values.yaml
+++ b/charts/backend/charts/notification-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/notification-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/notification-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/notification-event-handler-app-k8s/templates/deployment.yaml
index 27a79b5..8a6fa15 100755
--- a/charts/backend/charts/notification-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/notification-event-handler-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: notification-event-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/notification-event-handler-app-k8s/values.yaml b/charts/backend/charts/notification-event-handler-app-k8s/values.yaml
index 64cf658..b0a11ab 100755
--- a/charts/backend/charts/notification-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/notification-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/notification-event-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/realtime-app-k8s/templates/deployment.yaml b/charts/backend/charts/realtime-app-k8s/templates/deployment.yaml
index 41f3aac..cbe9c78 100755
--- a/charts/backend/charts/realtime-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/realtime-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: realtime-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/realtime-app-k8s/values.yaml b/charts/backend/charts/realtime-app-k8s/values.yaml
index e39f565..c0b74b6 100755
--- a/charts/backend/charts/realtime-app-k8s/values.yaml
+++ b/charts/backend/charts/realtime-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/realtime-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/regular-chat-splitter-app-k8s/templates/deployment.yaml b/charts/backend/charts/regular-chat-splitter-app-k8s/templates/deployment.yaml
index 819fb96..9b11cf9 100755
--- a/charts/backend/charts/regular-chat-splitter-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/regular-chat-splitter-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: regular-chat-splitter-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/regular-chat-splitter-app-k8s/values.yaml b/charts/backend/charts/regular-chat-splitter-app-k8s/values.yaml
index 1f85e1d..b409907 100755
--- a/charts/backend/charts/regular-chat-splitter-app-k8s/values.yaml
+++ b/charts/backend/charts/regular-chat-splitter-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/regular-chat-splitter-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/search-app-k8s/templates/deployment.yaml b/charts/backend/charts/search-app-k8s/templates/deployment.yaml
index be83330..e17f45f 100755
--- a/charts/backend/charts/search-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/search-app-k8s/templates/deployment.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       containers:
         - name: search-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/search-app-k8s/values.yaml b/charts/backend/charts/search-app-k8s/values.yaml
index 65874cb..dbb1104 100755
--- a/charts/backend/charts/search-app-k8s/values.yaml
+++ b/charts/backend/charts/search-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/search-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/search-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/search-event-handler-app-k8s/templates/deployment.yaml
index b209877..90c5a63 100755
--- a/charts/backend/charts/search-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/search-event-handler-app-k8s/templates/deployment.yaml
@@ -22,7 +22,7 @@ spec:
 
       containers:
         - name: search-event-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: ELASTIC_HOST
diff --git a/charts/backend/charts/search-event-handler-app-k8s/values.yaml b/charts/backend/charts/search-event-handler-app-k8s/values.yaml
index b41839d..04dfef7 100755
--- a/charts/backend/charts/search-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/search-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/search-event-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/sticker-app-k8s/templates/deployment.yaml b/charts/backend/charts/sticker-app-k8s/templates/deployment.yaml
index c1b65b7..44d1483 100755
--- a/charts/backend/charts/sticker-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/sticker-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: sticker-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/sticker-app-k8s/values.yaml b/charts/backend/charts/sticker-app-k8s/values.yaml
index c9acdeb..b1647ec 100755
--- a/charts/backend/charts/sticker-app-k8s/values.yaml
+++ b/charts/backend/charts/sticker-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/sticker-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/unregister-tokens-app-k8s/templates/deployment.yaml b/charts/backend/charts/unregister-tokens-app-k8s/templates/deployment.yaml
index 006dd10..e9596ad 100755
--- a/charts/backend/charts/unregister-tokens-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/unregister-tokens-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: unregister-tokens-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/unregister-tokens-app-k8s/values.yaml b/charts/backend/charts/unregister-tokens-app-k8s/values.yaml
index 5faacfd..03b9c8d 100755
--- a/charts/backend/charts/unregister-tokens-app-k8s/values.yaml
+++ b/charts/backend/charts/unregister-tokens-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/unregister-tokens-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/upload-app-k8s/templates/deployment.yaml b/charts/backend/charts/upload-app-k8s/templates/deployment.yaml
index c6ebcd7..4b9777b 100755
--- a/charts/backend/charts/upload-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/upload-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: upload-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/upload-app-k8s/values.yaml b/charts/backend/charts/upload-app-k8s/values.yaml
index fccf63d..29be046 100755
--- a/charts/backend/charts/upload-app-k8s/values.yaml
+++ b/charts/backend/charts/upload-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/upload-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/user-app-k8s/templates/deployment.yaml b/charts/backend/charts/user-app-k8s/templates/deployment.yaml
index 4a0e553..de42dea 100755
--- a/charts/backend/charts/user-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/user-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: user-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
           - containerPort: 9090
diff --git a/charts/backend/charts/user-app-k8s/values.yaml b/charts/backend/charts/user-app-k8s/values.yaml
index 4bce33e..5127c09 100755
--- a/charts/backend/charts/user-app-k8s/values.yaml
+++ b/charts/backend/charts/user-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/user-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/voip-splitter-app-k8s/templates/deployment.yaml b/charts/backend/charts/voip-splitter-app-k8s/templates/deployment.yaml
index 96e12a4..668eb28 100755
--- a/charts/backend/charts/voip-splitter-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/voip-splitter-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: voip-splitter-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/voip-splitter-app-k8s/values.yaml b/charts/backend/charts/voip-splitter-app-k8s/values.yaml
index 9e3c5ed..1334aeb 100755
--- a/charts/backend/charts/voip-splitter-app-k8s/values.yaml
+++ b/charts/backend/charts/voip-splitter-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/voip-splitter-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/web-sender-app-k8s/templates/deployment.yaml b/charts/backend/charts/web-sender-app-k8s/templates/deployment.yaml
index 113d872..6327ec8 100755
--- a/charts/backend/charts/web-sender-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/web-sender-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -50,7 +50,7 @@ spec:
               fi
       containers:
         - name: web-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/web-sender-app-k8s/values.yaml b/charts/backend/charts/web-sender-app-k8s/values.yaml
index 5a21aff..88dcc53 100755
--- a/charts/backend/charts/web-sender-app-k8s/values.yaml
+++ b/charts/backend/charts/web-sender-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/web-sender-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/workspace-app-k8s/templates/deployment.yaml b/charts/backend/charts/workspace-app-k8s/templates/deployment.yaml
index 1dea7d9..cda10e0 100755
--- a/charts/backend/charts/workspace-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/workspace-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -45,7 +45,7 @@ spec:
                 -keystore /tmp/cacerts/cacerts
       containers:
         - name: workspace-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             {{- include "global.env.cassandra" . | nindent 12 }}
diff --git a/charts/backend/charts/workspace-app-k8s/values.yaml b/charts/backend/charts/workspace-app-k8s/values.yaml
index 5a7d9c5..e956f07 100755
--- a/charts/backend/charts/workspace-app-k8s/values.yaml
+++ b/charts/backend/charts/workspace-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/workspace-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always
 
diff --git a/charts/backend/charts/workspace-event-handler-app-k8s/templates/deployment.yaml b/charts/backend/charts/workspace-event-handler-app-k8s/templates/deployment.yaml
index cadbd76..4b18e8d 100755
--- a/charts/backend/charts/workspace-event-handler-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/workspace-event-handler-app-k8s/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           emptyDir: {}
       initContainers:
         - name: import-ca
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           env:
             - name: CERT_ALIAS
               value: {{ .Values.global.cert_alias | quote }}
@@ -50,7 +50,7 @@ spec:
               fi
       containers:
         - name: workspace-event-handler-app
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 9090
diff --git a/charts/backend/charts/workspace-event-handler-app-k8s/values.yaml b/charts/backend/charts/workspace-event-handler-app-k8s/values.yaml
index 504d75c..a4243c3 100755
--- a/charts/backend/charts/workspace-event-handler-app-k8s/values.yaml
+++ b/charts/backend/charts/workspace-event-handler-app-k8s/values.yaml
@@ -1,7 +1,6 @@
 replicaCount: 1
 
 image:
-  repository: docker.ii-p001.local/workspace-event-handler-app
   tag: 1.0.0-SNAPSHOT
   pullPolicy: Always