diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index 4961a31f8e..95cc8818a0 100644
--- a/stable/spinnaker/Chart.yaml
+++ b/stable/spinnaker/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
 name: spinnaker
-version: 1.20.1
-appVersion: 1.12.5
+version: 1.20.2
+appVersion: 1.16.1
 home: http://spinnaker.io/
 sources:
 - https://github.com/spinnaker
diff --git a/stable/spinnaker/templates/_helpers.tpl b/stable/spinnaker/templates/_helpers.tpl
index e0eb7c527c..513af74168 100644
--- a/stable/spinnaker/templates/_helpers.tpl
+++ b/stable/spinnaker/templates/_helpers.tpl
@@ -43,6 +43,14 @@ Create comma separated list of omitted namespaces in Kubernetes
 {{- join "," .Values.kubeConfig.omittedNameSpaces }}
 {{- end -}}
 
+{{- define "omittedKinds" -}}
+{{- join "," .Values.kubeConfig.omittedKinds }}
+{{- end -}}
+
+{{- define "k8sKinds" -}}
+{{- join "," .Values.kubeConfig.kinds }}
+{{- end -}}
+
 {{/*
 Redis base URL for Spinnaker
 */}}
diff --git a/stable/spinnaker/templates/configmap/halyard-config.yaml b/stable/spinnaker/templates/configmap/halyard-config.yaml
index 6bc14c696e..b1ac0d103e 100644
--- a/stable/spinnaker/templates/configmap/halyard-config.yaml
+++ b/stable/spinnaker/templates/configmap/halyard-config.yaml
@@ -116,7 +116,11 @@ data:
                 --context {{ $context }} {{ if not $.Values.kubeConfig.enabled }}--service-account true{{ end }} \
                 {{ if $.Values.kubeConfig.enabled }}--kubeconfig-file {{ template "spinnaker.kubeconfig" $ }}{{ end }} \
                 {{ if $.Values.kubeConfig.onlySpinnakerManaged.enabled }}--only-spinnaker-managed true{{ end }} \
-                --omit-namespaces={{ template "omittedNameSpaces" $ }} --provider-version v2
+                {{ if not $.Values.kubeConfig.checkPermissionsOnStartup }}--check-permissions-on-startup false{{ end }} \
+                --omit-namespaces={{ template "omittedNameSpaces" $ }} \
+                {{ if $.Values.kubeConfig.omittedKinds }}--omit-kinds={{ template "omittedKinds" $ }}{{ end }} \
+                {{ if $.Values.kubeConfig.kinds }}--kinds={{ template "k8sKinds" $ }}{{ end }} \
+                --provider-version v2
     {{- end }}
     $HAL_COMMAND config deploy edit --account-name {{ .Values.kubeConfig.deploymentContext }} --type distributed \
                            --location {{ .Release.Namespace }}
diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
index 1b2bd37f7e..9da8f808df 100644
--- a/stable/spinnaker/values.yaml
+++ b/stable/spinnaker/values.yaml
@@ -1,8 +1,8 @@
 halyard:
-  spinnakerVersion: 1.12.5
+  spinnakerVersion: 1.16.1
   image:
     repository: gcr.io/spinnaker-marketplace/halyard
-    tag: 1.20.2
+    tag: 1.23.2
   # Set to false to disable persistence data volume for halyard
   persistence:
     enabled: true
@@ -154,6 +154,21 @@ kubeConfig:
   onlySpinnakerManaged:
     enabled: false
 
+  # When false, clouddriver will skip the permission checks for all kubernetes kinds at startup.
+  # This can save a great deal of time during clouddriver startup when you have many kubernetes
+  # accounts configured. This disables the log messages at startup about missing permissions.
+  checkPermissionsOnStartup: true
+
+  # A list of resource kinds this Spinnaker account can deploy to and will cache.
+  # When no kinds are configured, this defaults to ‘all kinds'.
+  # kinds:
+  # -
+
+  # A list of resource kinds this Spinnaker account cannot deploy to or cache.
+  # This can only be set when –kinds is empty or not set.
+  # omittedKinds:
+  # -
+
 # Change this if youd like to expose Spinnaker outside the cluster
 ingress:
   enabled: false