diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 6c730b627..a1ae4cf54 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -87,16 +87,6 @@ jobs:
           max_attempts: 3
           retry_wait_seconds: 60
           command: PLATFORMS="${PLATFORMS}" VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
-      - name: Build Helm chart
-        uses: nick-invision/retry@master
-        with:
-          timeout_minutes: 5
-          max_attempts: 3
-          retry_wait_seconds: 10
-          command: |
-            make chart_build_nightly
-            echo "CHART_PACKAGE_PATH=$(cat /tmp/selenium_chart_version)" >> $GITHUB_ENV
-            echo "CHART_FILE_NAME=$(basename $(cat /tmp/selenium_chart_version))" >> $GITHUB_ENV
       - name: Login Docker Hub
         run: |
           docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
@@ -115,13 +105,6 @@ jobs:
           command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make release_nightly
       - name: Update package versions
         run: make generate_nightly_sbom
-      - name: Push Helm chart to registry
-        uses: nick-invision/retry@master
-        with:
-          timeout_minutes: 20
-          max_attempts: 3
-          retry_wait_seconds: 120
-          command: make chart_release
       - name: Get current latest tag
         run: echo "LATEST_TAG=$(git describe --tags --abbrev=0 --exclude=nightly --exclude=selenium-grid*)" >> $GITHUB_ENV
       - name: Display latest tag
@@ -144,6 +127,23 @@ jobs:
         with:
           tag: ${{ env.BASE_RELEASE }}
           token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build Helm chart
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 5
+          max_attempts: 3
+          retry_wait_seconds: 10
+          command: |
+            make chart_build_nightly
+            echo "CHART_PACKAGE_PATH=$(cat /tmp/selenium_chart_version)" >> $GITHUB_ENV
+            echo "CHART_FILE_NAME=$(basename $(cat /tmp/selenium_chart_version))" >> $GITHUB_ENV
+      - name: Push Helm chart to registry
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 20
+          max_attempts: 3
+          retry_wait_seconds: 120
+          command: make chart_release
       - name: Create Nightly Release
         id: create_release
         uses: softprops/action-gh-release@master
diff --git a/Makefile b/Makefile
index 8742693d0..4948b70e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
 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.24.0)
-BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.24.0)
-BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.24.0)
+BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.25.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.25.0)
+BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.25.0)
 BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
-BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.25.0-SNAPSHOT)
-VERSION := $(or $(VERSION),$(VERSION),4.24.0)
+BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.26.0-SNAPSHOT)
+VERSION := $(or $(VERSION),$(VERSION),4.25.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/tests/charts/make/chart_release.sh b/tests/charts/make/chart_release.sh
index 332393374..1240c11b5 100755
--- a/tests/charts/make/chart_release.sh
+++ b/tests/charts/make/chart_release.sh
@@ -7,7 +7,7 @@ NAMESPACE=${NAMESPACE:-"selenium"}
 latest_chart_version=$(find . \( -type d -name .git -prune \) -o -type f -wholename '*/selenium-grid/Chart.yaml' -print0 | xargs -0 cat | grep ^version | cut -d ':' -f 2 | tr -d '[:space:]')
 echo "${latest_chart_version}" > /tmp/latest_chart_version
 helm template oci://registry-1.docker.io/${NAMESPACE}/selenium-grid --version ${latest_chart_version}
-if [[ $? -eq 0 ]]; then
+if [[ $? -eq 0 ]] && [[ "${latest_chart_version}" != *nightly ]]; then
     echo "Chart version $latest_chart_version is already available in the registry"
     exit 0
 fi