diff --git a/Makefile b/Makefile
index 8314863d8b..20e1b22e84 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 NAME := $(or $(NAME),$(NAME),selenium)
 CURRENT_DATE := $(shell date '+%Y%m%d')
 BUILD_DATE := $(or $(BUILD_DATE),$(BUILD_DATE),$(CURRENT_DATE))
-BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.17.0)
-BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.17.0)
+BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.18.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.18.0)
 BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
-BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.18.0-SNAPSHOT)
-VERSION := $(or $(VERSION),$(VERSION),4.17.0)
+BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.19.0-SNAPSHOT)
+VERSION := $(or $(VERSION),$(VERSION),4.18.0)
 TAG_VERSION := $(VERSION)-$(BUILD_DATE)
 CHART_VERSION_NIGHTLY := $(or $(CHART_VERSION_NIGHTLY),$(CHART_VERSION_NIGHTLY),1.0.0-nightly)
 NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
diff --git a/charts/selenium-grid/CHANGELOG.md b/charts/selenium-grid/CHANGELOG.md
index 01678d5cad..365e18ab2d 100644
--- a/charts/selenium-grid/CHANGELOG.md
+++ b/charts/selenium-grid/CHANGELOG.md
@@ -3,7 +3,7 @@
 - Chart is using image tag 4.17.0-20240123
 
 ### Added
-- feat(chart): templating in name(Override) for new object [deploy] Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com> :: Viet Nguyen Duc
+- feat(chart): templating in name(Override) for new object [deploy] :: Viet Nguyen Duc
 - feat(chart): templating in name(Override) (#2107) :: Bas M
 - feat(chart): Add node registration secret to exec preStop container Update default scalingStrategy.strategy: accurate [skip ci] :: Viet Nguyen Duc
 - feat(chart): Configuration extra scripts mount to container (#2105) :: Viet Nguyen Duc
diff --git a/docker-compose-v3-video-upload.yml b/docker-compose-v3-video-upload.yml
index f0d80aabef..a543aec7fe 100644
--- a/docker-compose-v3-video-upload.yml
+++ b/docker-compose-v3-video-upload.yml
@@ -5,7 +5,7 @@
 version: "3"
 services:
   chrome:
-    image: selenium/node-chrome:nightly
+    image: selenium/node-chrome:4.17.0-20240123
     shm_size: 2gb
     depends_on:
       - selenium-hub
@@ -15,7 +15,7 @@ services:
       - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
 
   edge:
-    image: selenium/node-edge:nightly
+    image: selenium/node-edge:4.17.0-20240123
     shm_size: 2gb
     depends_on:
       - selenium-hub
@@ -25,7 +25,7 @@ services:
       - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
 
   firefox:
-    image: selenium/node-firefox:nightly
+    image: selenium/node-firefox:4.17.0-20240123
     shm_size: 2gb
     depends_on:
       - selenium-hub
@@ -35,7 +35,7 @@ services:
       - SE_EVENT_BUS_SUBSCRIBE_PORT=4443
 
   chrome_video:
-    image: selenium/video:nightly
+    image: selenium/video:ffmpeg-6.1-20240123
     depends_on:
       - chrome
     environment:
@@ -55,7 +55,7 @@ services:
       - RCLONE_CONFIG_S3_ENDPOINT=https://storage.googleapis.com
 
   edge_video:
-    image: selenium/video:nightly
+    image: selenium/video:ffmpeg-6.1-20240123
     depends_on:
       - edge
     environment:
@@ -75,7 +75,7 @@ services:
       - RCLONE_CONFIG_S3_ENDPOINT=https://storage.googleapis.com
 
   firefox_video:
-    image: selenium/video:nightly
+    image: selenium/video:ffmpeg-6.1-20240123
     depends_on:
       - firefox
     environment:
@@ -95,7 +95,7 @@ services:
       - RCLONE_CONFIG_S3_ENDPOINT=https://storage.googleapis.com
 
   selenium-hub:
-    image: selenium/hub:nightly
+    image: selenium/hub:4.17.0-20240123
     container_name: selenium-hub
     ports:
       - "4442:4442"
diff --git a/generate_chart_changelog.sh b/generate_chart_changelog.sh
index 4afaedfb6b..93dccb6e11 100755
--- a/generate_chart_changelog.sh
+++ b/generate_chart_changelog.sh
@@ -29,6 +29,7 @@ generate_changelog() {
 
     # Get the changes for each section (Added, Removed, Fixed, Changed)
     image_tag_changes=$(echo "Chart is using image tag $CHART_APP_VERSION" | sed -e 's/^/- /')
+    k8s_versions_tested=$(echo "Chart is tested on Kubernetes versions: $(cat .github/workflows/helm-chart-test.yml | grep -oP "k8s-version: '\Kv.*(?=')" | tr '\n' ',')")
     added_changes=$(git log --pretty=format:"%s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "^feat|^add" | sed -e 's/^/- /')
     removed_changes=$(git log --pretty=format:"%s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "^remove|^deprecate|^delete" | sed -e 's/^/- /')
     fixed_changes=$(git log --pretty=format:"%s :: %an" "$commit_range" -- "$CHART_DIR" | grep -iE "^fix|^bug" | sed -e 's/^/- /')
@@ -46,6 +47,7 @@ generate_changelog() {
     echo "## :heavy_check_mark: ${current_tag}" >> "$temp_file"
     echo "" >> "$temp_file"
     echo "$image_tag_changes" >> "$temp_file"
+    echo "$k8s_versions_tested" >> "$temp_file"
     echo "" >> "$temp_file"
 
     if [ -n "$added_changes" ]; then
diff --git a/tests/bootstrap.sh b/tests/bootstrap.sh
index 24d3c9980c..df744cea8f 100755
--- a/tests/bootstrap.sh
+++ b/tests/bootstrap.sh
@@ -7,7 +7,7 @@ if [ "${CI:-false}" = "false" ]; then
   source docker-selenium-tests/bin/activate
 fi
 
-python -m pip install selenium==4.17.2 \
+python -m pip install selenium==4.18.0 \
                       docker===6.1.3 \
                       | grep -v 'Requirement already satisfied'
 
diff --git a/tests/charts/ci/base-auth-ingress-values.yaml b/tests/charts/ci/base-auth-ingress-values.yaml
index 6432880bd3..6f1dcff988 100644
--- a/tests/charts/ci/base-auth-ingress-values.yaml
+++ b/tests/charts/ci/base-auth-ingress-values.yaml
@@ -32,7 +32,7 @@ hub:
     - name: SE_SESSION_RETRY_INTERVAL
       value: "5"
     - name: SE_HEALTHCHECK_INTERVAL
-      value: "5"
+      value: "15"
     - name: SE_REJECT_UNSUPPORTED_CAPS
       value: "false"
     - name: SE_OPTS
diff --git a/tests/charts/make/chart_cluster_setup.sh b/tests/charts/make/chart_cluster_setup.sh
index 913074eefa..dc37ac267d 100755
--- a/tests/charts/make/chart_cluster_setup.sh
+++ b/tests/charts/make/chart_cluster_setup.sh
@@ -56,7 +56,7 @@ elif [ "${CLUSTER}" = "minikube" ]; then
   sudo chmod 777 /tmp
   export CHANGE_MINIKUBE_NONE_USER=true
   sudo -SE minikube start --vm-driver=none --cpus ${CPUs} --memory ${MEMORY} \
-  --kubernetes-version=${KUBERNETES_VERSION} --network-plugin=cni --cni=${CNI} --container-runtime=${CONTAINER_RUNTIME}
+  --kubernetes-version=${KUBERNETES_VERSION} --network-plugin=cni --cni=${CNI} --container-runtime=${CONTAINER_RUNTIME} --wait=all
   sudo chown -R $USER $HOME/.kube $HOME/.minikube
 fi
 
@@ -70,3 +70,6 @@ if [ "${CLUSTER}" = "kind" ]; then
       kind load docker-image --name ${CLUSTER_NAME} "$image"
   done
 fi
+
+echo "Wait for KEDA core to be ready"
+kubectl -n ${KEDA_NAMESPACE} wait --for=condition=ready pod -l app.kubernetes.io/instance=${KEDA_NAMESPACE} --timeout 180s
diff --git a/tests/charts/make/chart_test.sh b/tests/charts/make/chart_test.sh
index 033ce7a727..8211c3e4f3 100755
--- a/tests/charts/make/chart_test.sh
+++ b/tests/charts/make/chart_test.sh
@@ -109,6 +109,8 @@ helm template --debug ${HELM_COMMAND_ARGS} > tests/tests/cluster_deployment_mani
 echo "Deploy Selenium Grid Chart"
 helm upgrade --install ${HELM_COMMAND_ARGS}
 
+kubectl get pods -A
+
 echo "Run Tests"
 export CHART_CERT_PATH=$(readlink -f ${CHART_CERT_PATH})
 export SELENIUM_GRID_PROTOCOL=${SELENIUM_GRID_PROTOCOL}