diff --git a/stable/selenium/Chart.yaml b/stable/selenium/Chart.yaml
index f0ee41195c..d8b5a4fae2 100644
--- a/stable/selenium/Chart.yaml
+++ b/stable/selenium/Chart.yaml
@@ -1,5 +1,5 @@
 name: selenium
-version: 1.0.6
+version: 1.0.7
 appVersion: 3.141.59
 description: Chart for selenium grid
 keywords:
diff --git a/stable/selenium/README.md b/stable/selenium/README.md
index 46aa0e6b03..2dbec4488b 100644
--- a/stable/selenium/README.md
+++ b/stable/selenium/README.md
@@ -42,7 +42,7 @@ The following table lists the configurable parameters of the Selenium chart and
 
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
-| `global.nodeselector` | Node label to be useed globally for scheduling of all images | `nil` |
+| `global.nodeSelector` | Node label to be useed globally for scheduling of all images | `nil` |
 | `global.hostAliases` | A list of hostAliases, that contains ip and hostnames, to be used globally | `[]` |
 | `global.affinity` | Deployemnt affinities to be used globally for scheduling of all images | `nil` |
 | `global.tolerations` | Deployment tolerations to be used globally for scheduling of all images | `nil` |
@@ -72,7 +72,7 @@ The following table lists the configurable parameters of the Selenium chart and
 | `hub.gridUnregisterIfStillDownAfter` | | `nil` |
 | `hub.seOpts` | Command line arguments to pass to hub | `nil` |
 | `hub.timeZone` | The time zone for the container | `nil` |
-| `hub.nodeselector` | Node label to use for scheduling of the hub if set this takes precedence over the global value | `nil` |
+| `hub.nodeSelector` | Node label to use for scheduling of the hub if set this takes precedence over the global value | `nil` |
 | `hub.affinity` | Deployemnt affinities to use for scheduling of the hub if set this takes precedence over the global value | `nil` |
 | `hub.tolerations` | Deployment tolerations to use for scheduling of the hub if set this takes precedence over the global value | `nil` |
 | `hub.ingress.enabled` | Configure an ingress for the selenium hub | `false` |
@@ -106,7 +106,7 @@ The following table lists the configurable parameters of the Selenium chart and
 | `chrome.nodePort` | The port to listen on | `nil` |
 | `chrome.seOpts` | Command line arguments to pass to node | `nil` |
 | `chrome.timeZone` | The time zone for the container | `nil` |
-| `chrome.nodeselector` | Node label to use for scheduling of chrome images if set this takes precedence over the global value | `nil` |
+| `chrome.nodeSelector` | Node label to use for scheduling of chrome images if set this takes precedence over the global value | `nil` |
 | `chrome.affinity` | Deployemnt affinities to use for scheduling of the chrome if set this takes precedence over the global value | `nil` |
 | `chrome.tolerations` | Deployment tolerations to use for scheduling of the chrome if set this takes precedence over the global value | `nil` |
 | `chromeDebug.enabled` | Schedule a selenium node chrome debug pod | `false` |
@@ -132,7 +132,7 @@ The following table lists the configurable parameters of the Selenium chart and
 | `chromeDebug.nodePort` | The port to listen on | `nil` |
 | `chromeDebug.seOpts` | Command line arguments to pass to node | `nil` |
 | `chromeDebug.timeZone` | The time zone for the container | `nil` |
-| `chromeDebug.nodeselector` | Node label to use for scheduling of chromeDebug images if set this takes precedence over the global value | `nil` |
+| `chromeDebug.nodeSelector` | Node label to use for scheduling of chromeDebug images if set this takes precedence over the global value | `nil` |
 | `chromeDebug.affinity` | Deployemnt affinities to use for scheduling of the chromeDebug if set this takes precedence over the global value | `nil` |
 | `chromeDebug.tolerations` | Deployment tolerations to use for scheduling of the chromeDebug if set this takes precedence over the global value | `nil` |
 | `firefox.enabled` | Schedule a selenium node firefox pod | `false` |
@@ -156,7 +156,7 @@ The following table lists the configurable parameters of the Selenium chart and
 | `firefox.nodePort` | The port to listen on | `nil` |
 | `firefox.seOpts` | Command line arguments to pass to node | `nil` |
 | `firefox.timeZone` | The time zone for the container | `nil` |
-| `firefox.nodeselector` | Node label to use for scheduling of firefox images if set this takes precedence over the global value | `nil` |
+| `firefox.nodeSelector` | Node label to use for scheduling of firefox images if set this takes precedence over the global value | `nil` |
 | `firefox.affinity` | Deployemnt affinities to use for scheduling of the firefox if set this takes precedence over the global value | `nil` |
 | `firefox.tolerations` | Deployment tolerations to use for scheduling of the firefox if set this takes precedence over the global value | `nil` |
 | `firefoxDebug.enabled` | Schedule a selenium node firefox debug pod | `false` |
@@ -180,7 +180,7 @@ The following table lists the configurable parameters of the Selenium chart and
 | `firefoxDebug.nodePort` | The port to listen on | `nil` |
 | `firefoxDebug.seOpts` | Command line arguments to pass to node | `nil` |
 | `firefoxDebug.timeZone` | The time zone for the container | `nil` |
-| `firefoxDebug.nodeselector` | Node label to use for scheduling of firefoxDebug images if set this takes precedence over the global value | `nil` |
+| `firefoxDebug.nodeSelector` | Node label to use for scheduling of firefoxDebug images if set this takes precedence over the global value | `nil` |
 | `firefoxDebug.affinity` | Deployemnt affinities to use for scheduling of the firefoxDebug if set this takes precedence over the global value | `nil` |
 | `firefoxDebug.tolerations` | Deployment tolerations to use for scheduling of the firefoxDebug if set this takes precedence over the global value | `nil` |
 
diff --git a/stable/selenium/templates/chrome-deployment.yaml b/stable/selenium/templates/chrome-deployment.yaml
index 9b95d38979..af0ee53afd 100644
--- a/stable/selenium/templates/chrome-deployment.yaml
+++ b/stable/selenium/templates/chrome-deployment.yaml
@@ -83,36 +83,36 @@ spec:
             {{- end }}
           volumeMounts:
 {{ if .Values.chrome.volumeMounts -}}
-{{ toYaml .Values.chrome.volumeMounts | indent 12 }}
+{{ toYaml .Values.chrome.volumeMounts | trim | indent 12 }}
 {{- end }}
           resources:
-{{ toYaml .Values.chrome.resources | indent 12 }}
+{{ toYaml .Values.chrome.resources | trim | indent 12 }}
 {{- if or .Values.global.imagePullSecrets .Values.chrome.imagePullSecrets }}
       imagePullSecrets: 
       - name: {{ .Values.chrome.imagePullSecrets | default .Values.global.imagePullSecrets | quote }}
 {{- end }}
       volumes:
 {{ if .Values.chrome.volumes -}}
-{{ toYaml .Values.chrome.volumes | indent 8 }}
+{{ toYaml .Values.chrome.volumes | trim | indent 8 }}
 {{- end }}
       hostAliases:
-{{ toYaml .Values.global.hostAliases | indent 8 }}
+{{ toYaml .Values.global.hostAliases | trim | indent 8 }}
       nodeSelector:
 {{- if .Values.chrome.nodeSelector }}
-{{ toYaml .Values.chrome.nodeSelector | indent 8  }}
+{{ toYaml .Values.chrome.nodeSelector | trim | indent 8  }}
 {{- else if .Values.global.nodeSelector }}
-{{ toYaml .Values.global.nodeSelector | indent 8  }}
-{{- end -}}
+{{ toYaml .Values.global.nodeSelector | trim | indent 8  }}
+{{- end }}
       affinity:
 {{- if .Values.chrome.affinity }}
 {{ toYaml .Values.chrome.affinity | indent 8  }}
 {{- else if .Values.global.affinity }}
 {{ toYaml .Values.global.affinity | indent 8  }}
-{{- end -}}
+{{- end }}
       tolerations:
 {{- if .Values.chrome.tolerations }}
 {{ toYaml .Values.chrome.tolerations | indent 8  }}
 {{- else if .Values.global.tolerations }}
 {{ toYaml .Values.global.tolerations | indent 8  }}
-{{- end -}}
+{{- end }}
 {{- end -}}
diff --git a/stable/selenium/templates/firefox-deployment.yaml b/stable/selenium/templates/firefox-deployment.yaml
index a04e0ba1bd..c3af5f86df 100644
--- a/stable/selenium/templates/firefox-deployment.yaml
+++ b/stable/selenium/templates/firefox-deployment.yaml
@@ -91,20 +91,20 @@ spec:
 {{ toYaml .Values.global.hostAliases | indent 8 }}
       nodeSelector:
 {{- if .Values.firefox.nodeSelector }}
-{{ toYaml .Values.firefox.nodeSelector | indent 8  }}
+{{ toYaml .Values.firefox.nodeSelector | trim | indent 8  }}
 {{- else if .Values.global.nodeSelector }}
-{{ toYaml .Values.global.nodeSelector | indent 8  }}
+{{ toYaml .Values.global.nodeSelector | trim | indent 8  }}
 {{- end }}
       affinity:
 {{- if .Values.firefox.affinity }}
-{{ toYaml .Values.firefox.affinity | indent 8  }}
+{{ toYaml .Values.firefox.affinity | trim | indent 8  }}
 {{- else if .Values.global.affinity }}
-{{ toYaml .Values.global.affinity | indent 8  }}
+{{ toYaml .Values.global.affinity | trim | indent 8  }}
 {{- end }}
       tolerations:
 {{- if .Values.firefox.tolerations }}
-{{ toYaml .Values.firefox.tolerations | indent 8  }}
+{{ toYaml .Values.firefox.tolerations | trim | indent 8  }}
 {{- else if .Values.global.tolerations }}
-{{ toYaml .Values.global.tolerations | indent 8  }}
+{{ toYaml .Values.global.tolerations | trim | indent 8  }}
 {{- end }}
 {{- end -}}
diff --git a/stable/selenium/templates/hub-deployment.yaml b/stable/selenium/templates/hub-deployment.yaml
index 2e8dfb877b..f049d7934c 100644
--- a/stable/selenium/templates/hub-deployment.yaml
+++ b/stable/selenium/templates/hub-deployment.yaml
@@ -92,16 +92,16 @@ spec:
 {{ toYaml .Values.hub.extraEnvs | indent 12 }}
             {{- end }}
           resources:
-{{ toYaml .Values.hub.resources | indent 12 }}
+{{ toYaml .Values.hub.resources | trim | indent 12 -}}
 {{- if or .Values.global.imagePullSecrets .Values.hub.imagePullSecrets }}
       imagePullSecrets: 
       - name: {{ .Values.hub.imagePullSecrets | default .Values.global.imagePullSecrets | quote }}
 {{- end }}
       nodeSelector:
 {{- if .Values.hub.nodeSelector }}
-{{ toYaml .Values.hub.nodeSelector | indent 8  }}
+{{ toYaml .Values.hub.nodeSelector | trim | indent 8  }}
 {{- else if .Values.global.nodeSelector }}
-{{ toYaml .Values.global.nodeSelector | indent 8  }}
+{{ toYaml .Values.global.nodeSelector | trim | indent 8  }}
 {{- end }}
       affinity:
 {{- if .Values.hub.affinity }}