diff --git a/charts/selenium-grid/templates/chrome-node-deployment.yaml b/charts/selenium-grid/templates/chrome-node-deployment.yaml
index 7177c1181..d289c66ef 100644
--- a/charts/selenium-grid/templates/chrome-node-deployment.yaml
+++ b/charts/selenium-grid/templates/chrome-node-deployment.yaml
@@ -21,7 +21,7 @@ spec:
   replicas: {{ .Values.chromeNode.replicas }}
   {{- else }}
   replicas: {{ default $.Values.autoscaling.scaledOptions.minReplicaCount ($.Values.chromeNode.scaledOptions).minReplicaCount }}
-  {{ end }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.global.seleniumGrid.revisionHistoryLimit }}
   selector:
     matchLabels:
diff --git a/charts/selenium-grid/templates/edge-node-deployment.yaml b/charts/selenium-grid/templates/edge-node-deployment.yaml
index 8a0b7f69b..a82248253 100644
--- a/charts/selenium-grid/templates/edge-node-deployment.yaml
+++ b/charts/selenium-grid/templates/edge-node-deployment.yaml
@@ -21,7 +21,7 @@ spec:
   replicas: {{ .Values.edgeNode.replicas }}
   {{- else }}
   replicas: {{ default $.Values.autoscaling.scaledOptions.minReplicaCount ($.Values.edgeNode.scaledOptions).minReplicaCount }}
-  {{ end }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.global.seleniumGrid.revisionHistoryLimit }}
   selector:
     matchLabels:
diff --git a/charts/selenium-grid/templates/firefox-node-deployment.yaml b/charts/selenium-grid/templates/firefox-node-deployment.yaml
index 584473563..29e01ffad 100644
--- a/charts/selenium-grid/templates/firefox-node-deployment.yaml
+++ b/charts/selenium-grid/templates/firefox-node-deployment.yaml
@@ -21,7 +21,7 @@ spec:
   replicas: {{ .Values.firefoxNode.replicas }}
   {{- else }}
   replicas: {{ default $.Values.autoscaling.scaledOptions.minReplicaCount ($.Values.firefoxNode.scaledOptions).minReplicaCount }}
-  {{ end }}
+  {{- end }}
   revisionHistoryLimit: {{ .Values.global.seleniumGrid.revisionHistoryLimit }}
   selector:
     matchLabels:
diff --git a/charts/selenium-grid/templates/monitoring-scape-secret.yaml b/charts/selenium-grid/templates/monitoring-scape-secret.yaml
index 610c9d1c5..ab29d689a 100644
--- a/charts/selenium-grid/templates/monitoring-scape-secret.yaml
+++ b/charts/selenium-grid/templates/monitoring-scape-secret.yaml
@@ -4,8 +4,8 @@ kind: Secret
 metadata:
   name: {{ template "seleniumGrid.monitoring.exporter.fullname" $ }}
   namespace: {{ .Release.Namespace }}
-  annotations:
   {{- with .Values.monitoring.annotations }}
+  annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   labels: