diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index 7a63dc09c3..f2a956e920 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.9
+version: 0.3.10
 appVersion: 1.1.0
 home: http://spinnaker.io/
 sources:
diff --git a/stable/spinnaker/templates/configmap/jenkins-config.yaml b/stable/spinnaker/templates/configmap/jenkins-config.yaml
index fc131c75df..1cff70a58c 100644
--- a/stable/spinnaker/templates/configmap/jenkins-config.yaml
+++ b/stable/spinnaker/templates/configmap/jenkins-config.yaml
@@ -28,6 +28,7 @@ data:
         <org.csanchez.jenkins.plugins.kubernetes.KubernetesCloud plugin="kubernetes@0.8">
           <name>kubernetes</name>
           <templates>
+{{- if .Values.jenkins.Agent.Enabled }}
             <org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
               <name>jnlp</name>
               <image>{{ .Values.jenkins.Agent.Image }}:{{ .Values.jenkins.Agent.ImageTag }}</image>
@@ -38,7 +39,13 @@ data:
               <remoteFs>/home/jenkins</remoteFs>
               <instanceCap>2147483647</instanceCap>
               <label></label>
-              <nodeSelector></nodeSelector>
+              <nodeSelector>
+                {{- $local := dict "first" true }}
+                {{- range $key, $value := .Values.jenkins.Agent.NodeSelector }}
+                  {{- if not $local.first }},{{- end }}
+                  {{- $key }}={{ $value }}
+                  {{- $_ := set $local "first" false }}
+                {{- end }}</nodeSelector>
               <resourceRequestCpu>{{ .Values.jenkins.Agent.Cpu }}</resourceRequestCpu>
               <resourceRequestMemory>{{ .Values.jenkins.Agent.Memory }}</resourceRequestMemory>
               <resourceLimitCpu>{{ .Values.jenkins.Agent.Cpu }}</resourceLimitCpu>
@@ -57,6 +64,7 @@ data:
               <annotations/>
               <imagePullSecrets/>
             </org.csanchez.jenkins.plugins.kubernetes.PodTemplate>
+{{- end -}}
           </templates>
           <serverUrl>https://kubernetes.default</serverUrl>
           <skipTlsVerify>false</skipTlsVerify>
diff --git a/stable/spinnaker/templates/deployments/clouddriver.yaml b/stable/spinnaker/templates/deployments/clouddriver.yaml
index edcb44ee9b..790d40de09 100644
--- a/stable/spinnaker/templates/deployments/clouddriver.yaml
+++ b/stable/spinnaker/templates/deployments/clouddriver.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: clouddriver
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.clouddriver }}
           name: clouddriver
diff --git a/stable/spinnaker/templates/deployments/deck.yaml b/stable/spinnaker/templates/deployments/deck.yaml
index 1fad5907ef..7847320e38 100644
--- a/stable/spinnaker/templates/deployments/deck.yaml
+++ b/stable/spinnaker/templates/deployments/deck.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: deck
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.deck }}
           name: deck
diff --git a/stable/spinnaker/templates/deployments/echo.yaml b/stable/spinnaker/templates/deployments/echo.yaml
index fa25540c19..fefaf61723 100644
--- a/stable/spinnaker/templates/deployments/echo.yaml
+++ b/stable/spinnaker/templates/deployments/echo.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: echo
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.echo }}
           name: echo
diff --git a/stable/spinnaker/templates/deployments/front50.yaml b/stable/spinnaker/templates/deployments/front50.yaml
index 9964e395e3..6442b371e5 100644
--- a/stable/spinnaker/templates/deployments/front50.yaml
+++ b/stable/spinnaker/templates/deployments/front50.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: front50
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.front50 }}
           name: front50
diff --git a/stable/spinnaker/templates/deployments/gate.yaml b/stable/spinnaker/templates/deployments/gate.yaml
index 2f540d85af..81d220c0d0 100644
--- a/stable/spinnaker/templates/deployments/gate.yaml
+++ b/stable/spinnaker/templates/deployments/gate.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: gate
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.gate }}
           name: gate
diff --git a/stable/spinnaker/templates/deployments/igor.yaml b/stable/spinnaker/templates/deployments/igor.yaml
index 59752c719b..59947a5df9 100644
--- a/stable/spinnaker/templates/deployments/igor.yaml
+++ b/stable/spinnaker/templates/deployments/igor.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: igor
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.igor }}
           name: igor
diff --git a/stable/spinnaker/templates/deployments/orca.yaml b/stable/spinnaker/templates/deployments/orca.yaml
index 88e913ede0..cea3bb1332 100644
--- a/stable/spinnaker/templates/deployments/orca.yaml
+++ b/stable/spinnaker/templates/deployments/orca.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: orca
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.orca }}
           name: orca
diff --git a/stable/spinnaker/templates/deployments/rosco.yaml b/stable/spinnaker/templates/deployments/rosco.yaml
index 379231a9a2..572dacff91 100644
--- a/stable/spinnaker/templates/deployments/rosco.yaml
+++ b/stable/spinnaker/templates/deployments/rosco.yaml
@@ -18,6 +18,10 @@ spec:
         app: {{ template "fullname" . }}
         component: rosco
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       containers:
         - image: {{ .Values.images.rosco }}
           name: rosco
diff --git a/stable/spinnaker/templates/hooks/create-bucket.yaml b/stable/spinnaker/templates/hooks/create-bucket.yaml
index d099d9d92e..b943479b47 100644
--- a/stable/spinnaker/templates/hooks/create-bucket.yaml
+++ b/stable/spinnaker/templates/hooks/create-bucket.yaml
@@ -15,6 +15,10 @@ spec:
         app: {{ template "fullname" . }}
         component: minio
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       restartPolicy: OnFailure
       containers:
       - name: post-install-job
diff --git a/stable/spinnaker/templates/hooks/delete-jobs.yaml b/stable/spinnaker/templates/hooks/delete-jobs.yaml
index a64844d27f..0e3e33435a 100644
--- a/stable/spinnaker/templates/hooks/delete-jobs.yaml
+++ b/stable/spinnaker/templates/hooks/delete-jobs.yaml
@@ -14,6 +14,10 @@ spec:
         app: {{ template "fullname" . }}
         component: spinnaker
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       restartPolicy: OnFailure
       volumes:
       - name: kubectl
diff --git a/stable/spinnaker/templates/hooks/test.yaml b/stable/spinnaker/templates/hooks/test.yaml
index 39fcad7515..a46696a7b0 100644
--- a/stable/spinnaker/templates/hooks/test.yaml
+++ b/stable/spinnaker/templates/hooks/test.yaml
@@ -5,6 +5,10 @@ metadata:
   annotations:
     "helm.sh/hook": test-success
 spec:
+{{- if .Values.nodeSelector }}
+  nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 4 }}
+{{- end }}
   initContainers:
     - name: "test-framework"
       image: "dduportal/bats:0.4.0"
diff --git a/stable/spinnaker/templates/hooks/upload-build-image.yaml b/stable/spinnaker/templates/hooks/upload-build-image.yaml
index 4c07146bba..1c01af249c 100644
--- a/stable/spinnaker/templates/hooks/upload-build-image.yaml
+++ b/stable/spinnaker/templates/hooks/upload-build-image.yaml
@@ -14,6 +14,10 @@ spec:
         app: {{ template "fullname" . }}
         component: jenkins
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       restartPolicy: OnFailure
       volumes:
       - name: jenkins-jobs
diff --git a/stable/spinnaker/templates/hooks/upload-run-pipeline.yaml b/stable/spinnaker/templates/hooks/upload-run-pipeline.yaml
index c9752afa11..476315a5f0 100644
--- a/stable/spinnaker/templates/hooks/upload-run-pipeline.yaml
+++ b/stable/spinnaker/templates/hooks/upload-run-pipeline.yaml
@@ -14,6 +14,10 @@ spec:
         app: {{ template "fullname" . }}
         component: jenkins
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       restartPolicy: OnFailure
       volumes:
       - name: jenkins-jobs
diff --git a/stable/spinnaker/templates/hooks/upload-run-script.yaml b/stable/spinnaker/templates/hooks/upload-run-script.yaml
index 04a45cb3bc..7c31dd1e40 100644
--- a/stable/spinnaker/templates/hooks/upload-run-script.yaml
+++ b/stable/spinnaker/templates/hooks/upload-run-script.yaml
@@ -14,6 +14,10 @@ spec:
         app: {{ template "fullname" . }}
         component: jenkins
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
       restartPolicy: OnFailure
       volumes:
       - name: jenkins-jobs
diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
index b5bdaf483e..388e126396 100644
--- a/stable/spinnaker/values.yaml
+++ b/stable/spinnaker/values.yaml
@@ -80,10 +80,16 @@ resources:
     cpu: 1000m
     memory: 1280Mi
 
+# Node labels for pod assignment
+# Ref: https://kubernetes.io/docs/user-guide/node-selection/
+# nodeSelector to provide to each of the Spinnaker components
+nodeSelector: {}
+
 # Redis password to use for the in-cluster redis service
 # Redis is not exposed publically
 redis:
   redisPassword: password
+  nodeSelector: {}
 
 # Minio access/secret keys for the in-cluster S3 usage
 # Minio is not exposed publically
@@ -93,6 +99,7 @@ minio:
   serviceType: ClusterIP
   accessKey: spinnakeradmin
   secretKey: spinnakeradmin
+  nodeSelector: {}
 
 gcs:
   enabled: false
@@ -109,7 +116,9 @@ jenkins:
     Memory: "512Mi"
     ServiceType: ClusterIP
     CustomConfigMap: true
+    NodeSelector: {}
 
   Agent:
     Cpu: "500m"
     Memory: "512Mi"
+    NodeSelector: {}