diff --git a/charts/fission-all/templates/deployment.yaml b/charts/fission-all/templates/deployment.yaml
index 8eba3f11..94786018 100644
--- a/charts/fission-all/templates/deployment.yaml
+++ b/charts/fission-all/templates/deployment.yaml
@@ -169,7 +169,7 @@ spec:
         ports:
           - containerPort: 8888
             name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
       volumes:
       - name: config-volume
         configMap:
@@ -247,7 +247,7 @@ spec:
           name: metrics
         - containerPort: 8888
           name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -299,7 +299,7 @@ spec:
           value: {{ .Values.fetcherMaxMem | default "128Mi" | quote }}
         - name: DEBUG_ENV
           value: {{ .Values.debugEnv | quote }}
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -333,7 +333,7 @@ spec:
           value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
         - name: DEBUG_ENV
           value: {{ .Values.debugEnv | quote }}
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -438,7 +438,7 @@ spec:
         command: 
         - /heapster
         - --source=kubernetes:https://kubernetes.default
-      serviceAccount: {{ .Release.Namespace }}/fission-svc
+      serviceAccountName: {{ .Release.Namespace }}/fission-svc
 {{- end }}
 ---
 apiVersion: apps/v1
@@ -467,7 +467,7 @@ spec:
         env:
         - name: DEBUG_ENV
           value: {{ .Values.debugEnv | quote }}
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -498,7 +498,7 @@ spec:
 #      - name: kubectl-proxy
 #        image: {{ .Values.repository }}/lachlanevenson/k8s-kubectl
 #        args: ["proxy", "--port", "8001", "--address", "127.0.0.1"]
-#      serviceAccount: fission-svc
+#      serviceAccountName: fission-svc
 
 {{- if .Values.nats.enabled }}
 ---
@@ -587,7 +587,7 @@ spec:
           value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
         - name: DEBUG_ENV
           value: {{ .Values.debugEnv | quote }}
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -643,7 +643,7 @@ spec:
         - name: kafka-secrets
           mountPath: /etc/fission/secrets
         {{- end }}        
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
       {{- if .Values.kafka.authentication.tls.enabled }}
       volumes:
       - name: kafka-secrets
@@ -723,7 +723,7 @@ spec:
               key: key
         - name: DEBUG_ENV
           value: {{ .Values.debugEnv | quote }}
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -781,7 +781,7 @@ spec:
         ports:
           - containerPort: 8000
             name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
       volumes:
       - name: fission-storage
       {{- if .Values.persistence.enabled }}
diff --git a/charts/fission-all/templates/fluentbit.yaml b/charts/fission-all/templates/fluentbit.yaml
index a11d2673..b8b15c66 100644
--- a/charts/fission-all/templates/fluentbit.yaml
+++ b/charts/fission-all/templates/fluentbit.yaml
@@ -106,7 +106,7 @@ spec:
             - name: fluentbit-config
               mountPath: /fluent-bit/etc/
               readOnly: true
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
       volumes:
         - name: container-log
           hostPath:
diff --git a/charts/fission-all/templates/pre-upgrade-job.yaml b/charts/fission-all/templates/pre-upgrade-job.yaml
index 199c954e..b8ad16cd 100644
--- a/charts/fission-all/templates/pre-upgrade-job.yaml
+++ b/charts/fission-all/templates/pre-upgrade-job.yaml
@@ -30,4 +30,4 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: [ "/pre-upgrade-checks" ]
         args: ["--fn-pod-namespace", "{{ .Values.functionNamespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]
-      serviceAccount: fission-svc
\ No newline at end of file
+      serviceAccountName: fission-svc
diff --git a/charts/fission-all/templates/router.yaml b/charts/fission-all/templates/router.yaml
index 74489172..27675a91 100644
--- a/charts/fission-all/templates/router.yaml
+++ b/charts/fission-all/templates/router.yaml
@@ -84,7 +84,7 @@ spec:
           name: metrics
         - containerPort: 8888
           name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
diff --git a/charts/fission-core/templates/deployment.yaml b/charts/fission-core/templates/deployment.yaml
index eb982658..00b80e8b 100644
--- a/charts/fission-core/templates/deployment.yaml
+++ b/charts/fission-core/templates/deployment.yaml
@@ -168,7 +168,7 @@ spec:
         ports:
           - containerPort: 8888
             name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
       volumes:
       - name: config-volume
         configMap:
@@ -243,7 +243,7 @@ spec:
             name: metrics
           - containerPort: 8888
             name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -293,7 +293,7 @@ spec:
           value: {{ .Values.fetcherMaxCpu | default "1000m" | quote }}
         - name: FETCHER_MAXMEM
           value: {{ .Values.fetcherMaxMem | default "128Mi" | quote }}          
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -325,7 +325,7 @@ spec:
         env:
         - name: TRACING_SAMPLING_RATE
           value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -357,7 +357,7 @@ spec:
         env:
         - name: TRACING_SAMPLING_RATE
           value: {{ .Values.traceSamplingRate | default "0.5" | quote }}
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
@@ -400,7 +400,7 @@ spec:
         ports:
           - containerPort: 8000
             name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
       volumes:
       - name: fission-storage
       {{- if .Values.persistence.enabled }}   
diff --git a/charts/fission-core/templates/pre-upgrade-job.yaml b/charts/fission-core/templates/pre-upgrade-job.yaml
index 199c954e..b8ad16cd 100644
--- a/charts/fission-core/templates/pre-upgrade-job.yaml
+++ b/charts/fission-core/templates/pre-upgrade-job.yaml
@@ -30,4 +30,4 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         command: [ "/pre-upgrade-checks" ]
         args: ["--fn-pod-namespace", "{{ .Values.functionNamespace }}", "--envbuilder-namespace", "{{ .Values.builderNamespace }}"]
-      serviceAccount: fission-svc
\ No newline at end of file
+      serviceAccountName: fission-svc
diff --git a/charts/fission-core/templates/router.yaml b/charts/fission-core/templates/router.yaml
index 74489172..27675a91 100644
--- a/charts/fission-core/templates/router.yaml
+++ b/charts/fission-core/templates/router.yaml
@@ -84,7 +84,7 @@ spec:
           name: metrics
         - containerPort: 8888
           name: http
-      serviceAccount: fission-svc
+      serviceAccountName: fission-svc
 {{- if .Values.extraCoreComponentPodConfig }}
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}