diff --git a/templates/celery/deployment-celery.yaml b/templates/celery/deployment-celery.yaml
index 70ab462..f7c3a63 100644
--- a/templates/celery/deployment-celery.yaml
+++ b/templates/celery/deployment-celery.yaml
@@ -49,7 +49,7 @@ spec:
             - name: SESSION_EXPIRE_AT_BROWSER_CLOSE
               value: "true"
             - name: HTTP_LISTEN_PORT
-              value: "{{ .service.web.port }}"
+              value: {{ .service.web.port }}
             - name: WS_LISTEN_PORT
               value: "{{ .service.ws.port }}"
               {{- end }}
diff --git a/templates/core/deployment-core.yaml b/templates/core/deployment-core.yaml
index d05d85d..75fdf79 100644
--- a/templates/core/deployment-core.yaml
+++ b/templates/core/deployment-core.yaml
@@ -54,7 +54,7 @@ spec:
             - name: SESSION_EXPIRE_AT_BROWSER_CLOSE
               value: "true"
             - name: HTTP_LISTEN_PORT
-              value: "{{ .service.web.port }}"
+              value: {{ .service.web.port }}
             - name: WS_LISTEN_PORT
               value: "{{ .service.ws.port }}"
               {{- end }}
diff --git a/templates/koko/deployment-koko.yaml b/templates/koko/deployment-koko.yaml
index 2113b63..681cbd2 100644
--- a/templates/koko/deployment-koko.yaml
+++ b/templates/koko/deployment-koko.yaml
@@ -41,6 +41,13 @@ spec:
           command:
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
+          ports:
+            - name: web
+              containerPort: {{ .service.web.port }}
+              protocol: TCP
+            - name: ssh
+              containerPort: {{ .service.ssh.port }}
+              protocol: TCP
           env:
             - name: CORE_HOST
               value: http://{{include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
@@ -51,25 +58,19 @@ spec:
             - name: SSHD_PORT
               value: "{{ .service.ssh.port }}"
             - name: HTTPD_PORT
-              value: "{{ .service.web.port }}"
+              value: {{ .service.web.port }}
+              {{- end }}
             - name: SHARE_ROOM_TYPE
               value: redis
             - name: REDIS_HOST
-              value: "{{ $.Values.core.config.redis.host }}"
+              value: {{ include "jumpserver.redis.host" . | quote }}
             - name: REDIS_PORT
-              value: "{{ $.Values.core.config.redis.port }}"
+              value: {{ include "jumpserver.redis.port" . | quote }}
             - name: REDIS_PASSWORD
-              value: "{{ $.Values.core.config.redis.password }}"
+              value: {{ include "jumpserver.redis.password" . | quote }}
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
-          ports:
-            - name: web
-              containerPort: {{ .service.web.port }}
-              protocol: TCP
-            - name: ssh
-              containerPort: {{ .service.ssh.port }}
-              protocol: TCP
           livenessProbe:
             {{- toYaml .livenessProbe | nindent 12}}
           readinessProbe:
@@ -103,4 +104,3 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
-{{- end }}
diff --git a/templates/lion/deployment-lion.yaml b/templates/lion/deployment-lion.yaml
index bb2d0f7..5d647ee 100644
--- a/templates/lion/deployment-lion.yaml
+++ b/templates/lion/deployment-lion.yaml
@@ -41,6 +41,10 @@ spec:
           command:
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
+          ports:
+            - name: web
+              containerPort: {{ .service.web.port }}
+              protocol: TCP
           env:
             - name: CORE_HOST
               value: http://{{ include "jumpserver.fullname" $}}-jms-core:{{$.Values.core.service.web.port}}
@@ -49,22 +53,19 @@ spec:
             - name: LOG_LEVEL
               value: "{{ .config.log.level }}"
             - name: HTTPD_PORT
-              value: "{{ .service.web.port }}"
+              value: {{ .service.web.port }}
             - name: SHARE_ROOM_TYPE
               value: redis
+              {{- end }}
             - name: REDIS_HOST
-              value: "{{ $.Values.core.config.redis.host }}"
+              value: {{ include "jumpserver.redis.host" . | quote }}
             - name: REDIS_PORT
-              value: "{{ $.Values.core.config.redis.port }}"
+              value: {{ include "jumpserver.redis.port" . | quote }}
             - name: REDIS_PASSWORD
-              value: "{{ $.Values.core.config.redis.password }}"
+              value: {{ include "jumpserver.redis.password" . | quote }}
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}
-          ports:
-            - name: web
-              containerPort: {{ .service.web.port }}
-              protocol: TCP
           livenessProbe:
             {{- toYaml .livenessProbe | nindent 12}}
           readinessProbe:
@@ -98,4 +99,3 @@ spec:
         {{- toYaml . | nindent 8 }}
     {{- end }}
 {{- end }}
-{{- end }}
diff --git a/templates/omnidb/deployment-omnidb.yaml b/templates/omnidb/deployment-omnidb.yaml
index 94dc103..c5a91e3 100644
--- a/templates/omnidb/deployment-omnidb.yaml
+++ b/templates/omnidb/deployment-omnidb.yaml
@@ -51,7 +51,7 @@ spec:
             - name: websocket_port
               value: "{{ .service.ws.port }}"
             - name: listening_port
-              value: "{{ .service.web.port }}"
+              value: {{ .service.web.port }}
           {{- with .env }}
             {{- tpl (toYaml .) $ | nindent 12 }}
           {{- end }}