diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index ddf8cacc4e..0eeca9e266 100644
--- a/stable/spinnaker/Chart.yaml
+++ b/stable/spinnaker/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
 name: spinnaker
-version: 2.0.0-rc2
+version: 2.0.0-rc3
 appVersion: 1.16.2
 home: http://spinnaker.io/
 sources:
diff --git a/stable/spinnaker/README.md b/stable/spinnaker/README.md
index e0fcdf1ca2..b91a91cf3a 100644
--- a/stable/spinnaker/README.md
+++ b/stable/spinnaker/README.md
@@ -104,9 +104,9 @@ dockerRegistries:
 #   password: '<INSERT YOUR SERVICE ACCOUNT JSON HERE>'
 #   email: 1234@5678.com
 # - name: ecr
-#   address: https://<AWS-ACCOUNT-ID>.dkr.ecr.<REGION>.amazonaws.com
+#   address: <AWS-ACCOUNT-ID>.dkr.ecr.<REGION>.amazonaws.com
 #   username: AWS
-#   passwordCommand: "aws --region <REGION> ecr get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d | sed 's/^AWS://'"
+#   passwordCommand: aws --region <REGION> ecr get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d | sed 's/^AWS://'
 ```
 
 You can provide passwords as a Helm value, or you can use a pre-created secret containing your registry passwords.  The secret should have an item per Registry in the format: `<registry name>: <password>`. In which case you'll specify the secret to use in `dockerRegistryAccountSecret` like so:
diff --git a/stable/spinnaker/templates/configmap/halyard-config.yaml b/stable/spinnaker/templates/configmap/halyard-config.yaml
index 89ad034644..7055f29bc2 100644
--- a/stable/spinnaker/templates/configmap/halyard-config.yaml
+++ b/stable/spinnaker/templates/configmap/halyard-config.yaml
@@ -99,21 +99,11 @@ data:
       PROVIDER_COMMAND='add'
     fi
 
-    CREDS=""
-    {{ if $registry.username -}}
-    CREDS+="--username {{ $registry.username }}"
-    {{ if $registry.passwordCommand -}}
-    CREDS+=" --password-command {{ $registry.passwordCommand | quote }}"
-    {{- else -}}
-    CREDS+=" --password-file /opt/registry/passwords/{{ $registry.name }}"
-    {{- end -}}
-    {{ if $registry.email }}
-    CREDS+=" --email {{ $registry.email }}"
-    {{- end -}}
-    {{- end }}
-
     $HAL_COMMAND config provider docker-registry account $PROVIDER_COMMAND {{ $registry.name }} --address {{ $registry.address }} \
-        ${CREDS} {{ if $registry.repositories }} --repositories {{ range $index, $repository := $registry.repositories }}{{if $index}},{{end}}{{- $repository }}{{- end }}{{- end }}
+      {{ if $registry.username -}} --username {{ $registry.username }} \
+      {{ if $registry.passwordCommand -}} --password-command "{{ $registry.passwordCommand }}"{{ else -}} --password-file /opt/registry/passwords/{{ $registry.name }}{{- end }} \
+      {{ if $registry.email -}} --email {{ $registry.email }}{{- end -}}{{- end }} \
+      {{ if $registry.repositories -}} --repositories {{ range $index, $repository := $registry.repositories }}{{if $index}},{{end}}{{- $repository }}{{- end }}{{- end }}
 
     {{- end }}
 
diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
index aac6098e5b..3d67947ba3 100644
--- a/stable/spinnaker/values.yaml
+++ b/stable/spinnaker/values.yaml
@@ -1,8 +1,8 @@
 halyard:
-  spinnakerVersion: 1.16.7
+  spinnakerVersion: 1.19.4
   image:
     repository: gcr.io/spinnaker-marketplace/halyard
-    tag: 1.31.1
+    tag: 1.32.0
     pullSecrets: []
   # Set to false to disable persistence data volume for halyard
   persistence:
@@ -150,7 +150,7 @@ dockerRegistries:
 # - name: ecr
 #   address: <AWS-ACCOUNT-ID>.dkr.ecr.<REGION>.amazonaws.com
 #   username: AWS
-#   passwordCommand: "aws --region <REGION> ecr get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d | sed 's/^AWS://'"
+#   passwordCommand: aws --region <REGION> ecr get-authorization-token --output text --query 'authorizationData[].authorizationToken' | base64 -d | sed 's/^AWS://'
 
 # If you don't want to put your passwords into a values file
 # you can use a pre-created secret instead of putting passwords