diff --git a/stable/locust/Chart.yaml b/stable/locust/Chart.yaml
index f9c040a7dd..14cd0f0252 100644
--- a/stable/locust/Chart.yaml
+++ b/stable/locust/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: locust
 description: A modern load testing framework
-version: 1.0.0
+version: 1.1.0
 appVersion: 0.9.0
 maintainers:
   - name: so0k
diff --git a/stable/locust/README.md b/stable/locust/README.md
index 7c741d63e8..38ea2251ab 100644
--- a/stable/locust/README.md
+++ b/stable/locust/README.md
@@ -36,9 +36,13 @@ helm install -n locust-nymph --set master.config.target-host=http://site.example
 | `service.annotations`        | KV containing custom annotations        | `{}`                                                  |
 | `service.extraLabels`        | KV containing extra labels              | `{}`                                                  |
 | `master.config.target-host`  | locust target host                      | `http://site.example.com`                             |
+| `master.nodeSelector`        | k8s nodeselector                        | `{}`                                                  |
+| `master.tolerations`         | k8s tolerance                           | `{}`                                                  |
 | `worker.config.locust-script`| locust script to run                    | `/locust-tasks/tasks.py`                              |
 | `worker.config.configmapName`| configmap to mount locust scripts from  | `empty, configmap is created from tasks folder in Chart` |
 | `worker.replicaCount`        | Number of workers to run                | `2`                                                   |
+| `worker.nodeSelector`        | k8s nodeselector                        | `{}`                                                  |
+| `worker.tolerations`         | k8s tolerance                           | `{}`                                                  |
 
 Specify parameters using `--set key=value[,key=value]` argument to `helm install`
 
diff --git a/stable/locust/templates/master-deploy.yaml b/stable/locust/templates/master-deploy.yaml
index 68fff7e4f7..8fce4aad7a 100644
--- a/stable/locust/templates/master-deploy.yaml
+++ b/stable/locust/templates/master-deploy.yaml
@@ -69,3 +69,11 @@ spec:
         configMap:
           name: {{ template "locust.worker-configmap" . }}
       restartPolicy: Always
+{{- with .Values.master.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.master.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
diff --git a/stable/locust/templates/worker-deploy.yaml b/stable/locust/templates/worker-deploy.yaml
index e77279ce1e..4c824b6948 100644
--- a/stable/locust/templates/worker-deploy.yaml
+++ b/stable/locust/templates/worker-deploy.yaml
@@ -52,3 +52,11 @@ spec:
         - name: "locust-tasks"
           configMap:
             name: {{ template "locust.worker-configmap" . }}
+{{- with .Values.worker.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+{{- end }}
+{{- with .Values.worker.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+{{- end }}
diff --git a/stable/locust/values.yaml b/stable/locust/values.yaml
index 04ceda0b58..8ead2146d2 100644
--- a/stable/locust/values.yaml
+++ b/stable/locust/values.yaml
@@ -24,6 +24,13 @@ master:
     requests:
       cpu: 100m
       memory: 128Mi
+  nodeSelector: {}
+    # kops.k8s.io/instancegroup: master
+  tolerations: {}
+  # - key: "application"
+  #   operator: "Equal"
+  #   value: "api"
+  #   effect: "NoSchedule"
 worker:
   config:
 
@@ -40,3 +47,10 @@ worker:
     requests:
       cpu: 100m
       memory: 128Mi
+  nodeSelector: {}
+    # kops.k8s.io/instancegroup: worker
+  tolerations: {}
+  # - key: "application"
+  #   operator: "Equal"
+  #   value: "api"
+  #   effect: "NoSchedule"