diff --git a/charts/tidepool/Chart.yaml b/charts/tidepool/Chart.yaml
index 266de277..0db2e74c 100644
--- a/charts/tidepool/Chart.yaml
+++ b/charts/tidepool/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Tidepool
 name: tidepool
-version: 0.21.0
+version: 0.22.0
 maintainers:
   - name: Todd Kazakov
     email: todd@tidepool.org
diff --git a/charts/tidepool/charts/auth/templates/1-deployment.yaml b/charts/tidepool/charts/auth/templates/1-deployment.yaml
index 388db0d3..65c22644 100644
--- a/charts/tidepool/charts/auth/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/auth/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: auth
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: auth
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/blip/templates/1-deployment.yaml b/charts/tidepool/charts/blip/templates/1-deployment.yaml
index e607d880..b177f32b 100644
--- a/charts/tidepool/charts/blip/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blip/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: blip
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: blip
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/blob/templates/1-deployment.yaml b/charts/tidepool/charts/blob/templates/1-deployment.yaml
index 0c8cd42f..797c361d 100644
--- a/charts/tidepool/charts/blob/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/blob/templates/1-deployment.yaml
@@ -22,8 +22,9 @@ spec:
   strategy: {}
   template:
     metadata:
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: blob
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
       labels:
diff --git a/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml b/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml
index fdd52a16..25f5b624 100644
--- a/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/clinic-worker/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: clinic-worker
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: clinic-worker
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/clinic/templates/1-deployment.yaml b/charts/tidepool/charts/clinic/templates/1-deployment.yaml
index 95e9ec33..8eae6eed 100644
--- a/charts/tidepool/charts/clinic/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/clinic/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: clinic
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: clinic
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/data/templates/1-deployment.yaml b/charts/tidepool/charts/data/templates/1-deployment.yaml
index d330b19d..fe36ae67 100644
--- a/charts/tidepool/charts/data/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/data/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: data
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: data
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/devices/templates/1-deployment.yaml b/charts/tidepool/charts/devices/templates/1-deployment.yaml
index 72085d69..bb49e016 100644
--- a/charts/tidepool/charts/devices/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/devices/templates/1-deployment.yaml
@@ -21,8 +21,9 @@ spec:
         app: devices
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: devices
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/export/templates/1-deployment.yaml b/charts/tidepool/charts/export/templates/1-deployment.yaml
index 38527c86..173adeb3 100644
--- a/charts/tidepool/charts/export/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/export/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: export
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: export
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml b/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
index 9aef0ba8..f5059416 100644
--- a/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/gatekeeper/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: gatekeeper
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: gatekeeper
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/highwater/templates/1-deployment.yaml b/charts/tidepool/charts/highwater/templates/1-deployment.yaml
index 634ea60b..dd06be3f 100644
--- a/charts/tidepool/charts/highwater/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/highwater/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: highwater
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: highwater
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml b/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml
index 07919200..d40eae31 100644
--- a/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/hydrophone/templates/1-deployment.yaml
@@ -22,8 +22,9 @@ spec:
   replicas: {{ .Values.deployment.replicas }}
   template:
     metadata:
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: hydrophone
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
       labels:
diff --git a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
index 70eb90fc..11152e30 100644
--- a/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/jellyfish/templates/1-deployment.yaml
@@ -22,8 +22,9 @@ spec:
   strategy: {}
   template:
     metadata:
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: jellyfish
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
       labels:
diff --git a/charts/tidepool/charts/mailer/templates/1-deployment.yaml b/charts/tidepool/charts/mailer/templates/1-deployment.yaml
index 4d920e37..9009fbee 100644
--- a/charts/tidepool/charts/mailer/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/mailer/templates/1-deployment.yaml
@@ -28,8 +28,9 @@ spec:
         app: mailer
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: mailer
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/messageapi/templates/1-deployment.yaml b/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
index e5849697..4eb0cea4 100644
--- a/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/messageapi/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: message-api
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: messageapi
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml b/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml
index 681cc76d..3de27b3b 100644
--- a/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml
+++ b/charts/tidepool/charts/plotly-orca/templates/0-deployment.yaml
@@ -22,6 +22,11 @@ spec:
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
+{{- $imagePullSecrets := (.Values.deployment).imagePullSecrets | default ((.Values.global).deployment).imagePullSecrets -}}
+{{- if $imagePullSecrets }}
+      imagePullSecrets:
+      {{- toYaml $imagePullSecrets | nindent 6 }}
+{{- end }}
       containers:
       - name: plotly-orca
         image: {{ .Values.deployment.image | quote }}
diff --git a/charts/tidepool/charts/plotly-orca/values.yaml b/charts/tidepool/charts/plotly-orca/values.yaml
index 3b9ef634..4b7e1b0a 100644
--- a/charts/tidepool/charts/plotly-orca/values.yaml
+++ b/charts/tidepool/charts/plotly-orca/values.yaml
@@ -1,3 +1,3 @@
 deployment:
-  image: quay.io/plotly/orca
+  image: tidepool/plotly-orca:latest
   replicas: 1
\ No newline at end of file
diff --git a/charts/tidepool/charts/prescription/templates/1-deployment.yaml b/charts/tidepool/charts/prescription/templates/1-deployment.yaml
index 2f7f1af4..4b65d946 100644
--- a/charts/tidepool/charts/prescription/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/prescription/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: prescription
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: prescription
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/seagull/templates/1-deployment.yaml b/charts/tidepool/charts/seagull/templates/1-deployment.yaml
index 9c111832..2c7e946a 100644
--- a/charts/tidepool/charts/seagull/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/seagull/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: seagull
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: seagull
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/shoreline/templates/1-deployment.yaml b/charts/tidepool/charts/shoreline/templates/1-deployment.yaml
index ec1cb8e4..d3f97fea 100644
--- a/charts/tidepool/charts/shoreline/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/shoreline/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: shoreline
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: shoreline
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/task/templates/1-deployment.yaml b/charts/tidepool/charts/task/templates/1-deployment.yaml
index ede20d2d..ecdb5cc1 100644
--- a/charts/tidepool/charts/task/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/task/templates/1-deployment.yaml
@@ -27,8 +27,9 @@ spec:
         app: task
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: task
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
index acb9c78d..f2a47389 100644
--- a/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/tidewhisperer/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: tide-whisperer
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: tide-whisperer
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/tools/templates/1-deployment.yaml b/charts/tidepool/charts/tools/templates/1-deployment.yaml
index d6453ba0..302f14b5 100644
--- a/charts/tidepool/charts/tools/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/tools/templates/1-deployment.yaml
@@ -26,8 +26,9 @@ spec:
         app: tools
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: tools
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec:
diff --git a/charts/tidepool/charts/uploader/templates/1-deployment.yaml b/charts/tidepool/charts/uploader/templates/1-deployment.yaml
index 2ef1d865..739817c3 100644
--- a/charts/tidepool/charts/uploader/templates/1-deployment.yaml
+++ b/charts/tidepool/charts/uploader/templates/1-deployment.yaml
@@ -25,8 +25,9 @@ spec:
         app: uploader
         app.kubernetes.io/name: {{ include "charts.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
-{{ if .Values.podAnnotations }}
       annotations:
+        kubectl.kubernetes.io/default-container: uploader
+{{ if .Values.podAnnotations }}
         {{- .Values.podAnnotations | toYaml | nindent 8 }}
 {{- end }}
     spec: