diff --git a/helm-charts/infisical-gateway/templates/deployment.yaml b/helm-charts/infisical-gateway/templates/deployment.yaml
index 2671c0665..223bdabd8 100644
--- a/helm-charts/infisical-gateway/templates/deployment.yaml
+++ b/helm-charts/infisical-gateway/templates/deployment.yaml
@@ -37,17 +37,20 @@ spec:
           {{- end }}
           image: "infisical/cli:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: ["/sbin/tini", "--", "/bin/sh", "-c"]
           args:
-            - >-
-              if [ -z "${TOKEN}" ]; then 
-                echo 'ERROR: TOKEN environment variable must be set'; 
-                exit 1; 
-              fi && 
-              /bin/infisical gateway --token ${TOKEN}
+            - gateway
+            - --token
+            - $(TOKEN)
           envFrom:
             - secretRef:
                 name: {{ .Values.secret.name }}
+          env:
+            - name: TOKEN_VALIDATION
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.secret.name }}
+                  key: TOKEN
+                  optional: false
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}