diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md
index f9ef20d97..1f346e468 100644
--- a/charts/selenium-grid/CONFIGURATION.md
+++ b/charts/selenium-grid/CONFIGURATION.md
@@ -18,10 +18,10 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://jaegertracing.github.io/helm-charts | jaeger | 3.3.2 |
+| https://jaegertracing.github.io/helm-charts | jaeger | 3.3.3 |
 | https://kedacore.github.io/charts | keda | 2.16.0 |
 | https://kubernetes.github.io/ingress-nginx | ingress-nginx | 4.11.3 |
-| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 66.2.2 |
+| https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 66.3.0 |
 
 ## Values
 
diff --git a/charts/selenium-grid/templates/chrome-node-service.yaml b/charts/selenium-grid/templates/chrome-node-service.yaml
index cbdab86e8..f087f5813 100644
--- a/charts/selenium-grid/templates/chrome-node-service.yaml
+++ b/charts/selenium-grid/templates/chrome-node-service.yaml
@@ -5,10 +5,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "seleniumGrid.chromeNode.fullname" (list $nodeConfig $) }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ $.Release.Namespace }}
   labels:
     name: {{ template "seleniumGrid.chromeNode.fullname" (list $nodeConfig $) }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
   {{- with $nodeConfig.service.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
@@ -17,7 +17,7 @@ spec:
   type: {{ $nodeConfig.service.type }}
   selector:
     app: {{ template "seleniumGrid.chromeNode.fullname" (list $nodeConfig $) }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ $.Release.Name }}
   {{- if and (eq $nodeConfig.service.type "LoadBalancer") ($nodeConfig.service.loadBalancerIP) }}
   loadBalancerIP: {{ $nodeConfig.service.loadBalancerIP }}
   {{- end }}
diff --git a/charts/selenium-grid/templates/firefox-node-service.yaml b/charts/selenium-grid/templates/firefox-node-service.yaml
index cbf586290..86bc3b2f5 100644
--- a/charts/selenium-grid/templates/firefox-node-service.yaml
+++ b/charts/selenium-grid/templates/firefox-node-service.yaml
@@ -8,7 +8,7 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     name: {{ template "seleniumGrid.firefoxNode.fullname" (list $nodeConfig $) }}
-    {{- include "seleniumGrid.commonLabels" . | nindent 4 }}
+    {{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
   {{- with $nodeConfig.service.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/tests/charts/templates/render/dummy.yaml b/tests/charts/templates/render/dummy.yaml
index 671c4c63b..682ab40c0 100644
--- a/tests/charts/templates/render/dummy.yaml
+++ b/tests/charts/templates/render/dummy.yaml
@@ -121,16 +121,22 @@ chromeNode:
   annotations:
     "restartOnUpdate": "true"
   terminationGracePeriodSeconds: 7200
+  service:
+    enabled: true
 
 firefoxNode:
   nodeMaxSessions: 1
   annotations:
     "restartOnUpdate": "true"
   terminationGracePeriodSeconds: 720
+  service:
+    enabled: true
 
 edgeNode:
   annotations:
     "restartOnUpdate": "true"
+  service:
+    enabled: true
   videoRecorder:
     uploader:
       enabled: false
diff --git a/tests/charts/templates/render/dummy_solution.yaml b/tests/charts/templates/render/dummy_solution.yaml
index 45611b6d1..b702d6ec0 100644
--- a/tests/charts/templates/render/dummy_solution.yaml
+++ b/tests/charts/templates/render/dummy_solution.yaml
@@ -111,14 +111,20 @@ selenium-grid:
     nodeMaxSessions: 2
     affinity: *affinity
     terminationGracePeriodSeconds: 7200
+    service:
+      enabled: true
 
   firefoxNode:
     nodeMaxSessions: 1
     affinity: *affinity
     terminationGracePeriodSeconds: 720
+    service:
+      enabled: true
 
   edgeNode:
     affinity: *affinity
+    service:
+      enabled: true
     videoRecorder:
       uploader:
         enabled: false