diff --git a/.keda/README.md b/.keda/README.md
index dfb841703f..c5847b06a1 100644
--- a/.keda/README.md
+++ b/.keda/README.md
@@ -49,11 +49,13 @@ You can involve to review and discuss the pull requests to help us early detect
 
 [kedacore/keda](https://github.com/kedacore/keda)
 
-- https://github.com/kedacore/keda/pull/6570 (plan, v2.17.0)
+- ~~https://github.com/kedacore/keda/pull/6684 (merged, v2.17.0)~~
 
-- https://github.com/kedacore/keda/pull/6536 (plan, v2.17.0)
+- ~~https://github.com/kedacore/keda/pull/6570 (merged, v2.17.0)~~
 
-- https://github.com/kedacore/keda/pull/6477 (plan, v2.17.0)
+- ~~https://github.com/kedacore/keda/pull/6536 (merged, v2.17.0)~~
+
+- ~~https://github.com/kedacore/keda/pull/6477 (merged, v2.17.0)~~
 
 - ~~https://github.com/kedacore/keda/pull/6437 (merged, v2.16.1)~~
 
@@ -63,11 +65,13 @@ You can involve to review and discuss the pull requests to help us early detect
 
 [kedacore/keda-docs](https://github.com/kedacore/keda-docs)
 
-- https://github.com/kedacore/keda-docs/pull/1542 (plan, v2.17.0)
+- ~~https://github.com/kedacore/keda-docs/pull/1560 (merged, v2.17.0)~~
+
+- ~~https://github.com/kedacore/keda-docs/pull/1542 (merged, v2.17.0)~~
 
-- https://github.com/kedacore/keda-docs/pull/1533 (plan, v2.17.0)
+- ~~https://github.com/kedacore/keda-docs/pull/1533 (merged, v2.17.0)~~
 
-- https://github.com/kedacore/keda-docs/pull/1522 (plan, v2.17.0)
+- ~~https://github.com/kedacore/keda-docs/pull/1522 (merged, v2.17.0)~~
 
 - ~~https://github.com/kedacore/keda-docs/pull/1515 (merged, v2.16.1)~~
 
diff --git a/Makefile b/Makefile
index 7d021091c5..0c92e5e65d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,11 +31,11 @@ CHROMIUM_VERSION := $(or $(CHROMIUM_VERSION),$(CHROMIUM_VERSION),latest)
 FIREFOX_DOWNLOAD_URL := $(or $(FIREFOX_DOWNLOAD_URL),$(FIREFOX_DOWNLOAD_URL),)
 SBOM_OUTPUT := $(or $(SBOM_OUTPUT),$(SBOM_OUTPUT),package_versions.txt)
 KEDA_TAG_PREV_VERSION := $(or $(KEDA_TAG_PREV_VERSION),$(KEDA_TAG_PREV_VERSION),2.16.1-selenium-grid)
-KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.16.1)
-KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.16.1-selenium-grid)
+KEDA_CORE_VERSION := $(or $(KEDA_CORE_VERSION),$(KEDA_CORE_VERSION),2.17.0)
+KEDA_TAG_VERSION := $(or $(KEDA_TAG_VERSION),$(KEDA_TAG_VERSION),2.17.0-selenium-grid)
 KEDA_BASED_NAME := $(or $(KEDA_BASED_NAME),$(KEDA_BASED_NAME),ndviet)
-KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.16.1-selenium-grid-20250404)
-TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),true)
+KEDA_BASED_TAG := $(or $(KEDA_BASED_TAG),$(KEDA_BASED_TAG),2.17.0-selenium-grid-20250407)
+TEST_PATCHED_KEDA := $(or $(TEST_PATCHED_KEDA),$(TEST_PATCHED_KEDA),false)
 
 all: hub \
 	distributor \
diff --git a/charts/selenium-grid/CONFIGURATION.md b/charts/selenium-grid/CONFIGURATION.md
index 1570d9b7b7..9d934e0fa3 100644
--- a/charts/selenium-grid/CONFIGURATION.md
+++ b/charts/selenium-grid/CONFIGURATION.md
@@ -21,7 +21,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | https://charts.bitnami.com/bitnami | postgresql | 16.6.1 |
 | https://charts.bitnami.com/bitnami | redis | 20.11.4 |
 | https://jaegertracing.github.io/helm-charts | jaeger | 3.4.1 |
-| https://kedacore.github.io/charts | keda | 2.16.1 |
+| https://kedacore.github.io/charts | keda | 2.17.0 |
 | https://kubernetes.github.io/ingress-nginx | ingress-nginx | 4.12.1 |
 | https://prometheus-community.github.io/helm-charts | kube-prometheus-stack | 70.4.1 |
 
@@ -678,7 +678,6 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
 | videoRecorder.extraVolumes | list | `[]` | Extra volumes for video recorder pod |
 | videoRecorder.s3 | object | `{"args":[],"command":[],"extraEnvironmentVariables":[],"imageName":"aws-cli","imagePullPolicy":"IfNotPresent","imageRegistry":"bitnami","imageTag":"latest","securityContext":{"runAsUser":0}}` | Container spec for the uploader if above it is defined as "uploader.name: s3" |
 | customLabels | object | `{}` | Custom labels for k8s resources |
-| keda.image | object | `{"keda":{"registry":"selenium","repository":"keda","tag":"2.16.1-selenium-grid-20250323"},"metricsApiServer":{"registry":"selenium","repository":"keda-metrics-apiserver","tag":"2.16.1-selenium-grid-20250323"},"webhooks":{"registry":"selenium","repository":"keda-admission-webhooks","tag":"2.16.1-selenium-grid-20250323"}}` | Specify image for KEDA components |
 | keda.additionalAnnotations | string | `nil` | Annotations for KEDA resources |
 | keda.http.timeout | int | `60000` |  |
 | keda.webhooks | object | `{"enabled":false}` | Enable KEDA admission webhooks component |
diff --git a/charts/selenium-grid/Chart.yaml b/charts/selenium-grid/Chart.yaml
index abeb579c09..4889c3384a 100644
--- a/charts/selenium-grid/Chart.yaml
+++ b/charts/selenium-grid/Chart.yaml
@@ -7,7 +7,7 @@ appVersion: 4.30.0-20250323
 icon: https://github.com/SeleniumHQ/docker-selenium/raw/trunk/logo.png
 dependencies:
 - repository: https://kedacore.github.io/charts
-  version: 2.16.1
+  version: 2.17.0
   name: keda
   condition: autoscaling.enabled, keda.enabled
 - repository: https://kubernetes.github.io/ingress-nginx
diff --git a/charts/selenium-grid/values.yaml b/charts/selenium-grid/values.yaml
index 642920068c..bbb31ec12c 100644
--- a/charts/selenium-grid/values.yaml
+++ b/charts/selenium-grid/values.yaml
@@ -2034,19 +2034,19 @@ customLabels: {}
 keda:
   # enabled: false
   # -- Specify image for KEDA components
-  image:
-    keda:
-      registry: selenium
-      repository: keda
-      tag: "2.16.1-selenium-grid-20250323"
-    metricsApiServer:
-      registry: selenium
-      repository: keda-metrics-apiserver
-      tag: "2.16.1-selenium-grid-20250323"
-    webhooks:
-      registry: selenium
-      repository: keda-admission-webhooks
-      tag: "2.16.1-selenium-grid-20250323"
+#  image:
+#    keda:
+#      registry: selenium
+#      repository: keda
+#      tag: "2.16.1-selenium-grid-20250323"
+#    metricsApiServer:
+#      registry: selenium
+#      repository: keda-metrics-apiserver
+#      tag: "2.16.1-selenium-grid-20250323"
+#    webhooks:
+#      registry: selenium
+#      repository: keda-admission-webhooks
+#      tag: "2.16.1-selenium-grid-20250323"
   # -- Annotations for KEDA resources
   additionalAnnotations:
   http: