diff --git a/EventBus/start-selenium-grid-eventbus.sh b/EventBus/start-selenium-grid-eventbus.sh
index 13cf984815..6947d5dd96 100755
--- a/EventBus/start-selenium-grid-eventbus.sh
+++ b/EventBus/start-selenium-grid-eventbus.sh
@@ -54,6 +54,10 @@ if [ ! -z "$SE_EXTERNAL_URL" ]; then
   append_se_opts "--external-url" "${SE_EXTERNAL_URL}"
 fi
 
+if [ ! -z "${SE_EVENT_BUS_HEARTBEAT_PERIOD}" ]; then
+  append_se_opts "--eventbus-heartbeat-period" "${SE_EVENT_BUS_HEARTBEAT_PERIOD}"
+fi
+
 if [ "${SE_ENABLE_TLS}" = "true" ]; then
   # Configure truststore for the server
   if [ ! -z "$SE_JAVA_SSL_TRUST_STORE" ]; then
diff --git a/Hub/start-selenium-grid-hub.sh b/Hub/start-selenium-grid-hub.sh
index 55db7131a7..544e31ff14 100755
--- a/Hub/start-selenium-grid-hub.sh
+++ b/Hub/start-selenium-grid-hub.sh
@@ -133,6 +133,10 @@ if [ ! -z "${CONFIG_FILE}" ]; then
   append_se_opts "--config" "${CONFIG_FILE}"
 fi
 
+if [ ! -z "${SE_EVENT_BUS_HEARTBEAT_PERIOD}" ]; then
+  append_se_opts "--eventbus-heartbeat-period" "${SE_EVENT_BUS_HEARTBEAT_PERIOD}"
+fi
+
 EXTRA_LIBS=""
 if [ -n "${SE_EXTRA_LIBS}" ]; then
   EXTRA_LIBS="--ext ${SE_EXTRA_LIBS}"
diff --git a/Standalone/start-selenium-standalone.sh b/Standalone/start-selenium-standalone.sh
index d55e412323..49ce6cea81 100755
--- a/Standalone/start-selenium-standalone.sh
+++ b/Standalone/start-selenium-standalone.sh
@@ -99,6 +99,10 @@ if [ ! -z "$SE_EXTERNAL_URL" ]; then
   append_se_opts "--external-url" "${SE_EXTERNAL_URL}"
 fi
 
+if [ ! -z "${SE_EVENT_BUS_HEARTBEAT_PERIOD}" ]; then
+  append_se_opts "--eventbus-heartbeat-period" "${SE_EVENT_BUS_HEARTBEAT_PERIOD}"
+fi
+
 if [ "${SE_ENABLE_TLS}" = "true" ]; then
   # Configure truststore for the server
   if [ ! -z "$SE_JAVA_SSL_TRUST_STORE" ]; then
diff --git a/StandaloneDocker/start-selenium-grid-docker.sh b/StandaloneDocker/start-selenium-grid-docker.sh
index 15e0d8acf8..9fda0d1635 100755
--- a/StandaloneDocker/start-selenium-grid-docker.sh
+++ b/StandaloneDocker/start-selenium-grid-docker.sh
@@ -69,6 +69,10 @@ if [ ! -z "$SE_EXTERNAL_URL" ]; then
   append_se_opts "--external-url" "${SE_EXTERNAL_URL}"
 fi
 
+if [ ! -z "${SE_EVENT_BUS_HEARTBEAT_PERIOD}" ]; then
+  append_se_opts "--eventbus-heartbeat-period" "${SE_EVENT_BUS_HEARTBEAT_PERIOD}"
+fi
+
 if [ "${SE_ENABLE_TLS}" = "true" ]; then
   # Configure truststore for the server
   if [ ! -z "$SE_JAVA_SSL_TRUST_STORE" ]; then
diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md
index eaf3b3a1be..405264fb77 100644
--- a/charts/selenium-grid/CONFIGURATION.md
+++ b/charts/selenium-grid/CONFIGURATION.md
@@ -40,7 +40,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | global.seleniumGrid.defaultNodeStartupProbe | string | `"exec"` | Set default startup probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet |
 | global.seleniumGrid.defaultNodeReadinessProbe | string | `"exec"` | Set default readiness probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet |
 | global.seleniumGrid.defaultNodeLivenessProbe | string | `"exec"` | Set default readiness probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet |
-| global.seleniumGrid.defaultComponentLivenessProbe | string | `"exec"` | Set default liveness probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet |
+| global.seleniumGrid.defaultComponentLivenessProbe | string | `"httpGet"` | Set default liveness probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet |
 | global.seleniumGrid.stdoutProbeLog | bool | `false` | Probe logs output can be retrieved using `kubectl logs`. Noted: this will not work if shareProcessNamespace is enabled |
 | global.seleniumGrid.revisionHistoryLimit | int | `10` | Specify how many old ReplicaSets for this Deployment you want to retain. The rest will be garbage-collected in the background. |
 | global.seleniumGrid.structuredLogs | bool | `false` | Whether to enable structured logging |
diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
index 0b96362e49..a9d088a466 100644
--- a/charts/selenium-grid/values.yaml
+++ b/charts/selenium-grid/values.yaml
@@ -25,7 +25,7 @@ global:
     # -- Set default readiness probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet
     defaultNodeLivenessProbe: exec
     # -- Set default liveness probe method for all nodes (supplied values: httpGet, exec). If not set, the default is httpGet
-    defaultComponentLivenessProbe: exec
+    defaultComponentLivenessProbe: httpGet
     # -- Probe logs output can be retrieved using `kubectl logs`. Noted: this will not work if shareProcessNamespace is enabled
     stdoutProbeLog: false
     # -- Specify how many old ReplicaSets for this Deployment you want to retain. The rest will be garbage-collected in the background.