diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml
index 65c22644..4d2b3019 100644
--- a/charts/tidepool/charts/auth/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,dexcom,twiist,auth"
     configmap.reloader.stakater.com/reload: "abbott,dexcom,twiist"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -19,7 +19,7 @@ spec:
       app: auth
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas | default 1 }}
+  replicas: {{ (.Values.deployment).replicas | default 1 }}
   strategy: {}
   template:
     metadata:
@@ -324,7 +324,7 @@ spec:
         - name: {{ $key }}
           value: {{ $val | quote }}
 {{- end }}
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         {{ template "charts.platform.probes" .Values.global.ports.auth}}
diff --git a/charts/tidepool/charts/blip/templates/1-deployment.yaml b/charts/tidepool/charts/blip/templates/1-deployment.yaml
index b177f32b..e14ec355 100644
--- a/charts/tidepool/charts/blip/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blip/templates/1-deployment.yaml
@@ -8,8 +8,8 @@ metadata:
   name: blip
   namespace: {{.Release.Namespace}}
   annotations:
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -17,7 +17,7 @@ spec:
       app: blip
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -37,7 +37,7 @@ spec:
 {{toYaml . | indent 6}}{{- end }}
       {{- end }}
       containers:
-      - image: "{{ .Values.deployment.image }}"
+      - image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
 {{ if .Values.command }}
diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index 797c361d..b3c483cd 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -9,8 +9,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},blob"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -18,7 +18,7 @@ spec:
       app: blob
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -63,34 +63,34 @@ spec:
         - name: TIDEPOOL_BLOB_SERVICE_SERVER_ADDRESS
           value: :{{.Values.global.ports.blob}}
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_FILE_DIRECTORY
-          value: '{{.Values.deployment.env.store.file.directory}}'
+          value: '{{(.Values.deployment).env.store.file.directory}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_BUCKET
-          value: '{{ .Values.deployment.env.store.s3.bucket }}'
+          value: '{{ (.Values.deployment).env.store.s3.bucket }}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_S3_PREFIX
-          value: '{{.Values.deployment.env.store.s3.prefix}}'
+          value: '{{(.Values.deployment).env.store.s3.prefix}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_STORE_TYPE
-          value: '{{.Values.deployment.env.store.type}}'
+          value: '{{(.Values.deployment).env.store.type}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_FILE_DIRECTORY
-          value: '{{.Values.deployment.env.blobs.store.file.directory}}'
+          value: '{{(.Values.deployment).env.blobs.store.file.directory}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_BUCKET
-          value: '{{ .Values.deployment.env.blobs.store.s3.bucket }}'
+          value: '{{ (.Values.deployment).env.blobs.store.s3.bucket }}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_S3_PREFIX
-          value: '{{.Values.deployment.env.blobs.store.s3.prefix}}'
+          value: '{{(.Values.deployment).env.blobs.store.s3.prefix}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_BLOBS_STORE_TYPE
-          value: '{{.Values.deployment.env.blobs.store.type}}'
+          value: '{{(.Values.deployment).env.blobs.store.type}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_FILE_DIRECTORY
-          value: '{{.Values.deployment.env.logs.store.file.directory}}'
+          value: '{{(.Values.deployment).env.logs.store.file.directory}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_BUCKET
-          value: '{{ .Values.deployment.env.logs.store.s3.bucket }}'
+          value: '{{ (.Values.deployment).env.logs.store.s3.bucket }}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_S3_PREFIX
-          value: '{{.Values.deployment.env.logs.store.s3.prefix}}'
+          value: '{{(.Values.deployment).env.logs.store.s3.prefix}}'
         - name: TIDEPOOL_BLOB_SERVICE_UNSTRUCTURED_LOGS_STORE_TYPE
-          value: '{{.Values.deployment.env.logs.store.type}}'
+          value: '{{(.Values.deployment).env.logs.store.type}}'
 {{- range $key, $val := ((.Values.deployment).extraEnv | default ((.Values.global).deployment).extraEnv | default (dict)) }}
         - name: {{ $key }}
           value: {{ $val | quote }}
 {{- end }}
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         {{ template "charts.platform.probes" .Values.global.ports.blob}}
diff --git a/charts/tidepool/charts/data/templates/1-deployment.yaml b/charts/tidepool/charts/data/templates/1-deployment.yaml
index fe36ae67..d09e521c 100644
--- a/charts/tidepool/charts/data/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/data/templates/1-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},abbott,data"
     configmap.reloader.stakater.com/reload: "abbott"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -19,7 +19,7 @@ spec:
       app: data
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -153,7 +153,7 @@ spec:
               name: data
               key: AlertsRetryDelays
               optional: true
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         {{ template "charts.platform.probes" .Values.global.ports.data }}
diff --git a/charts/tidepool/charts/export/templates/1-deployment.yaml b/charts/tidepool/charts/export/templates/1-deployment.yaml
index 173adeb3..7d7cf0fe 100644
--- a/charts/tidepool/charts/export/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/export/templates/1-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "export"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -19,7 +19,7 @@ spec:
       app: export
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -60,7 +60,7 @@ spec:
               optional: true
         - name: PLOTLY_ORCA
           value: "http://plotly-orca:{{.Values.global.ports.plotly_orca}}"
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         livenessProbe:
diff --git a/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml b/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
index f5059416..f5b6d57a 100644
--- a/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
@@ -9,8 +9,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -18,7 +18,7 @@ spec:
       app: gatekeeper
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -58,7 +58,7 @@ spec:
           value: gatekeeper
         - name: USERSERVICE
           value: "shoreline:{{.Values.global.ports.shoreline}}"
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         readinessProbe:
diff --git a/charts/tidepool/charts/highwater/templates/1-deployment.yaml b/charts/tidepool/charts/highwater/templates/1-deployment.yaml
index dd06be3f..6f8dc22a 100644
--- a/charts/tidepool/charts/highwater/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/highwater/templates/1-deployment.yaml
@@ -8,8 +8,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "server,highwater,userdata,kissmetrics"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -17,7 +17,7 @@ spec:
       app: highwater
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -100,7 +100,7 @@ spec:
           value: highwater
         - name: USER_API_SERVICE
           value: '{"type": "static", "hosts": [{"protocol": "http", "host": "shoreline:{{.Values.global.ports.shoreline}}"}]}'
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         readinessProbe:
diff --git a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
index 11152e30..414083af 100644
--- a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
@@ -9,8 +9,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -18,7 +18,7 @@ spec:
       app: jellyfish
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -79,7 +79,7 @@ spec:
           value: "seagull:{{.Values.global.ports.seagull}}"
         - name: TIDEPOOL_PERMISSION_CLIENT_ADDRESS
           value: "gatekeeper:{{.Values.global.ports.gatekeeper}}"
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         livenessProbe:
diff --git a/charts/tidepool/charts/messageapi/templates/1-deployment.yaml b/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
index 4eb0cea4..26326b63 100644
--- a/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
@@ -9,8 +9,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -18,7 +18,7 @@ spec:
       app: message-api
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   template:
     metadata:
       labels:
@@ -74,7 +74,7 @@ spec:
           value: '{"type": "static", "hosts": [{"protocol": "http", "host": "shoreline:{{.Values.global.ports.shoreline}}"}]}'
         - name: SKIP_HAKKEN
           value: "true"
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         readinessProbe:
diff --git a/charts/tidepool/charts/migrations/templates/deployment.yaml b/charts/tidepool/charts/migrations/templates/deployment.yaml
index de447342..2b42a406 100644
--- a/charts/tidepool/charts/migrations/templates/deployment.yaml
+++ b/charts/tidepool/charts/migrations/templates/deployment.yaml
@@ -10,8 +10,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "{{ .Values.mongo.secretName }}"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -19,7 +19,7 @@ spec:
       app: migrations
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -54,7 +54,7 @@ spec:
         - name: {{ $key }}
           value: {{ $val | quote }}
 {{- end }}
-        image: {{ .Values.deployment.image | quote}}
+        image: {{ (.Values.deployment).image | quote}}
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         name: migrations
diff --git a/charts/tidepool/charts/seagull/templates/1-deployment.yaml b/charts/tidepool/charts/seagull/templates/1-deployment.yaml
index 2c7e946a..563e301a 100644
--- a/charts/tidepool/charts/seagull/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/seagull/templates/1-deployment.yaml
@@ -9,8 +9,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }}"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -18,7 +18,7 @@ spec:
       app: seagull
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -68,7 +68,7 @@ spec:
           value: '{"type": "static", "hosts": [{"protocol": "http", "host": "shoreline:{{.Values.global.ports.shoreline}}"}]}'
         - name: SKIP_HAKKEN
           value: "true"
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         readinessProbe:
diff --git a/charts/tidepool/charts/task/templates/1-deployment.yaml b/charts/tidepool/charts/task/templates/1-deployment.yaml
index ecdb5cc1..944c0bcb 100644
--- a/charts/tidepool/charts/task/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/task/templates/1-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},task,dexcom"
     configmap.reloader.stakater.com/reload: "dexcom"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -19,7 +19,7 @@ spec:
       app: task
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -99,9 +99,9 @@ spec:
               key: ClientURL
               optional: true
         - name: TIDEPOOL_TASK_QUEUE_DELAY
-          value: {{ .Values.deployment.env.queue.delay | quote }}
+          value: {{ (.Values.deployment).env.queue.delay | quote }}
         - name: TIDEPOOL_TASK_QUEUE_WORKERS
-          value: {{ .Values.deployment.env.queue.workers | quote }}
+          value: {{ (.Values.deployment).env.queue.workers | quote }}
         - name: TIDEPOOL_TASK_SERVICE_SECRET
           valueFrom:
             secretKeyRef:
@@ -113,7 +113,7 @@ spec:
         - name: {{ $key }}
           value: {{ $val | quote }}
 {{- end }}
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         {{ template "charts.platform.probes" .Values.global.ports.task}}
diff --git a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
index f2a47389..d97bc9fe 100644
--- a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
@@ -9,8 +9,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "server,{{ .Values.mongo.secretName }},auth"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -18,7 +18,7 @@ spec:
       app: tide-whisperer
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   strategy: {}
   template:
     metadata:
@@ -101,7 +101,7 @@ spec:
                     "service": "tide-whisperer"
                 }
             }
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         securityContext:
           {{- .Values.podSecurityContext | toYaml | nindent 10 }}
         readinessProbe:
diff --git a/charts/tidepool/charts/tools/templates/1-deployment.yaml b/charts/tidepool/charts/tools/templates/1-deployment.yaml
index 302f14b5..f1bc54d4 100644
--- a/charts/tidepool/charts/tools/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/tools/templates/1-deployment.yaml
@@ -10,8 +10,8 @@ metadata:
   namespace: {{.Release.Namespace}}
   annotations:
     secret.reloader.stakater.com/reload: "{{ .Values.mongo.secretName }},userdata"
-{{ if .Values.deployment.annotations }}
-    {{- .Values.deployment.annotations | toYaml | nindent 4 }}
+{{ if (.Values.deployment).annotations }}
+    {{- (.Values.deployment).annotations | toYaml | nindent 4 }}
 {{- end }}
 spec:
   selector:
@@ -19,7 +19,7 @@ spec:
       app: tools
       app.kubernetes.io/name: {{ include "charts.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
-  replicas: {{ .Values.deployment.replicas }}
+  replicas: {{ (.Values.deployment).replicas }}
   template:
     metadata:
       labels:
@@ -61,7 +61,7 @@ spec:
         - name: {{ $key }}
           value: {{ $val | quote }}
 {{- end }}
-        image: "{{ .Values.deployment.image }}"
+        image: "{{ (.Values.deployment).image }}"
         name: tools
         resources:
           {{- toYaml .Values.resources | nindent 10 }}