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 668eb28..c0fbbf7 100755
--- a/charts/backend/charts/voip-splitter-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/voip-splitter-app-k8s/templates/deployment.yaml
@@ -38,12 +38,16 @@ spec:
             - sh
             - -c
             - |
-              cp /usr/lib/jvm/java-21-amazon-corretto/lib/security/cacerts /tmp/cacerts/cacerts &&
-              keytool -import -trustcacerts -storepass changeit -noprompt \
-                -alias gemcert \
-                -file /app/resources/RootCA_${CERT_ALIAS}.crt \
-                -keystore /tmp/cacerts/cacerts
-      containers:
+              cp /usr/lib/jvm/java-21-amazon-corretto/lib/security/cacerts /tmp/cacerts/cacerts
+              if keytool -list -keystore /tmp/cacerts/cacerts -storepass changeit -alias gemcert > /dev/null 2>&1; then
+                echo "Certificate with alias gemcert already exists, skipping import"
+              else
+                echo "Importing certificate with alias gemcert"
+                keytool -import -trustcacerts -storepass changeit -noprompt \
+                  -alias gemcert \
+                  -file /app/resources/RootCA_${CERT_ALIAS}.crt \
+                  -keystore /tmp/cacerts/cacerts
+              fi      containers:
         - name: voip-splitter-app
           image: "{{ .Values.global.dockerRegistryPrefix }}{{ .Chart.Name }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -51,6 +55,8 @@ spec:
             {{- include "global.env.cassandra" . | nindent 12 }}
             {{- include "global.env.kafka" . | nindent 12 }}
             {{- include "global.env.redis" . | nindent 12 }}
+            {{- include "global.env.general" . | nindent 12 }}
+            {{- include "global.env.s3" . | nindent 12 }}
             - name: CHAT_SERVICE_HOST
               value: {{ .Values.env.chatServiceHost | quote }}
             - name: CHAT_SERVICE_PORT