diff -tubr charts/gateway.orig/templates/deployment.yaml charts/gateway/templates/deployment.yaml
--- charts/gateway.orig/templates/deployment.yaml	2022-12-09 14:58:33.000000000 +0000
+++ charts/gateway/templates/deployment.yaml	2022-12-13 11:43:02.196667885 +0000
@@ -11,6 +11,9 @@
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
+  # Give the LB 120s to detect and take into service
+  # should only be 40s by we are on AWS so ...
+  minReadySeconds: 120
   selector:
     matchLabels:
       {{- include "gateway.selectorLabels" . | nindent 6 }}
@@ -31,6 +34,7 @@
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      terminationGracePeriodSeconds: 120
       serviceAccountName: {{ include "gateway.serviceAccountName" . }}
       securityContext:
       {{- if .Values.securityContext }}
@@ -86,6 +90,10 @@
             name: http-envoy-prom
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+          {{- if .Values.volumeMounts }}
+          volumeMounts:
+          {{- toYaml .Values.volumeMounts | nindent 12 }}
+          {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -102,3 +110,7 @@
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff -tubr charts/gateway.orig/templates/service.yaml charts/gateway/templates/service.yaml
--- charts/gateway.orig/templates/service.yaml	2022-12-09 14:58:33.000000000 +0000
+++ charts/gateway/templates/service.yaml	2022-12-12 22:52:27.629670669 +0000
@@ -38,7 +38,14 @@
     port: 15017
     targetPort: 15017
 {{- else }}
-{{ .Values.service.ports | toYaml | indent 4 }}
+  {{- range $key, $val := .Values.service.ports }}
+  -
+    {{- range $pkey, $pval := $val }}
+    {{- if has $pkey (list "name" "nodePort" "port" "targetPort") }}
+    {{ $pkey}}: {{ $pval }}
+    {{- end }}
+    {{- end }}
+  {{- end }}
 {{- end }}
 {{- if .Values.service.externalIPs }}
   externalIPs: {{- range .Values.service.externalIPs }}
diff -tubr charts/gateway.orig/values.schema.json charts/gateway/values.schema.json
--- charts/gateway.orig/values.schema.json	2022-12-09 14:58:33.000000000 +0000
+++ charts/gateway/values.schema.json	2022-12-12 22:52:27.629670669 +0000
@@ -51,6 +51,12 @@
     "labels": {
       "type": "object"
     },
+    "volumes": {
+      "type": "array"
+    },
+    "volumeMounts": {
+      "type": "array"
+    },
     "name": {
       "type": "string"
     },