diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index e16859c300..cc1edcc7e8 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: 0.3.5
+version: 0.3.6
 appVersion: 1.1.0
 home: http://spinnaker.io/
 sources:
diff --git a/stable/spinnaker/templates/deployments/clouddriver.yaml b/stable/spinnaker/templates/deployments/clouddriver.yaml
index 96ccebdd86..edcb44ee9b 100644
--- a/stable/spinnaker/templates/deployments/clouddriver.yaml
+++ b/stable/spinnaker/templates/deployments/clouddriver.yaml
@@ -31,7 +31,7 @@ spec:
               name: {{ template "fullname" . }}-registry
           readinessProbe:
             httpGet:
-              path: /credentials
+              path: /health
               port: 7002
             initialDelaySeconds: 20
             timeoutSeconds: 1
diff --git a/stable/spinnaker/templates/deployments/echo.yaml b/stable/spinnaker/templates/deployments/echo.yaml
index 6cc5efcd0e..fa25540c19 100644
--- a/stable/spinnaker/templates/deployments/echo.yaml
+++ b/stable/spinnaker/templates/deployments/echo.yaml
@@ -29,7 +29,7 @@ spec:
               name: {{ template "fullname" . }}-spinnaker-config
           readinessProbe:
             httpGet:
-              path: /env
+              path: /health
               port: 8089
             initialDelaySeconds: 20
             timeoutSeconds: 1
diff --git a/stable/spinnaker/templates/deployments/front50.yaml b/stable/spinnaker/templates/deployments/front50.yaml
index 092511f273..9964e395e3 100644
--- a/stable/spinnaker/templates/deployments/front50.yaml
+++ b/stable/spinnaker/templates/deployments/front50.yaml
@@ -35,7 +35,7 @@ spec:
             {{ end }}
           readinessProbe:
             httpGet:
-              path: /env
+              path: /health
               port: 8080
             initialDelaySeconds: 20
             timeoutSeconds: 1
diff --git a/stable/spinnaker/templates/deployments/gate.yaml b/stable/spinnaker/templates/deployments/gate.yaml
index 481573cccb..2f540d85af 100644
--- a/stable/spinnaker/templates/deployments/gate.yaml
+++ b/stable/spinnaker/templates/deployments/gate.yaml
@@ -28,7 +28,8 @@ spec:
             - mountPath: /opt/spinnaker/config
               name: {{ template "fullname" . }}-spinnaker-config
           livenessProbe:
-            tcpSocket:
+            httpGet:
+              path: /health
               port: 8084
             initialDelaySeconds: 30
             timeoutSeconds: 1
diff --git a/stable/spinnaker/templates/deployments/igor.yaml b/stable/spinnaker/templates/deployments/igor.yaml
index bc3770a8d1..59752c719b 100644
--- a/stable/spinnaker/templates/deployments/igor.yaml
+++ b/stable/spinnaker/templates/deployments/igor.yaml
@@ -29,7 +29,7 @@ spec:
               name: {{ template "fullname" . }}-spinnaker-config
           readinessProbe:
             httpGet:
-              path: /env
+              path: /health
               port: 8088
             initialDelaySeconds: 20
             timeoutSeconds: 1
diff --git a/stable/spinnaker/templates/deployments/orca.yaml b/stable/spinnaker/templates/deployments/orca.yaml
index 23cfb53c44..88e913ede0 100644
--- a/stable/spinnaker/templates/deployments/orca.yaml
+++ b/stable/spinnaker/templates/deployments/orca.yaml
@@ -29,7 +29,7 @@ spec:
               name: {{ template "fullname" . }}-spinnaker-config
           readinessProbe:
             httpGet:
-              path: /env
+              path: /health
               port: 8083
             initialDelaySeconds: 20
             timeoutSeconds: 1
diff --git a/stable/spinnaker/templates/deployments/rosco.yaml b/stable/spinnaker/templates/deployments/rosco.yaml
index dbe598215f..379231a9a2 100644
--- a/stable/spinnaker/templates/deployments/rosco.yaml
+++ b/stable/spinnaker/templates/deployments/rosco.yaml
@@ -33,7 +33,7 @@ spec:
               name: docker-sock
           readinessProbe:
             httpGet:
-              path: /env
+              path: /health
               port: 8087
             initialDelaySeconds: 20
             timeoutSeconds: 1
diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
index 319045e267..d486c8f6d8 100644
--- a/stable/spinnaker/values.yaml
+++ b/stable/spinnaker/values.yaml
@@ -56,7 +56,7 @@ deck:
       # ingress.kubernetes.io/ssl-redirect: 'true'
       # kubernetes.io/ingress.class: nginx
       # kubernetes.io/tls-acme: "true"
-    #tls:
+    # tls:
     #  - secretName: -tls
     #    hosts:
     #      - domain.com
@@ -111,7 +111,7 @@ jenkins:
     ServiceType: ClusterIP
     CustomConfigMap: true
     InstallPlugins:
-      - kubernetes:0.11 
+      - kubernetes:0.11
       - workflow-aggregator:2.5
       - workflow-job:2.11
       - credentials-binding:1.12