diff --git a/charts/backend/charts/search-app-k8s/templates/deployment.yaml b/charts/backend/charts/search-app-k8s/templates/deployment.yaml
index e17f45f..1943cc5 100755
--- a/charts/backend/charts/search-app-k8s/templates/deployment.yaml
+++ b/charts/backend/charts/search-app-k8s/templates/deployment.yaml
@@ -23,22 +23,19 @@ spec:
               hostPort: 8088
               protocol: TCP
           env:
-            - name: CHAT_HOST
-              value: {{ .Values.env.chat.host | quote }}
-            - name: CHAT_PORT
-              value: {{ .Values.env.chat.port | quote }}
-            - name: CASSANDRA_PORT
-              value: {{ .Values.env.CASSANDRA_PORT | quote }}
-            - name: ELASTIC_HOST
-              value: {{ .Values.env.elastic.host | quote }}
-            - name: ELASTIC_PORT
-              value: {{ .Values.env.elastic.port | quote }}
             {{- include "global.env.cassandra" . | nindent 12 }}
             {{- include "global.env.kafka" . | nindent 12 }}
             {{- include "global.env.redis" . | nindent 12 }}
             {{- include "global.env.postgres" . | nindent 12 }}
+            {{- include "global.env.general" . | nindent 12 }}
+            - name: CHAT_HOST
+              value: {{ .Values.env.chat.host | quote }}
+            - name: CHAT_PORT
+              value: {{ .Values.env.chat.port | quote }}
+            - name: ELASTIC_HOST
+              value: {{ .Values.env.elastic.host | quote }}
+            - name: ELASTIC_PORT
+              value: {{ .Values.env.elastic.port | quote }}
             - name: POSTGRES_URL
               value: {{ .Values.env.postgres.url | quote }}
-            - name: KEYCLOAK_URL
-              value: {{ .Values.env.keycloak.url | quote }}
       restartPolicy: Always