diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index d2a3a5f9c..bacd199e7 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -42,11 +42,14 @@ jobs:
           TARGET_BRANCH: ${{ github.head_ref }}
       - name: Output branch name
         run: echo ${BRANCH}
-      - name: Sets build date
+      - name: Set Selenium base version
+        if: contains(toJson(github.event.commits), '[deploy]') == false
         run: |
-          echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           make set_nightly_env
           cat .env | xargs -I {} echo {} >> $GITHUB_ENV
+      - name: Sets build date
+        run: |
+          echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
           AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
@@ -55,6 +58,7 @@ jobs:
         with:
           timeout_minutes: 12
           max_attempts: 3
+          retry_wait_seconds: 60
           command: VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
       - name: Count image layers
         run: VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make count_image_layers
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1e015dac3..8b6516ff3 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -53,7 +53,12 @@ jobs:
       - name: Update chart CHANGELOG
         run: ./generate_chart_changelog.sh
       - name: Build images
-        run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 12
+          max_attempts: 3
+          retry_wait_seconds: 60
+          command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
       - name: Login Docker Hub
         run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
         env:
diff --git a/.github/workflows/helm-chart-test.yml b/.github/workflows/helm-chart-test.yml
index e22eb4831..491b4a18c 100644
--- a/.github/workflows/helm-chart-test.yml
+++ b/.github/workflows/helm-chart-test.yml
@@ -95,12 +95,15 @@ jobs:
           TARGET_BRANCH: ${{ github.head_ref }}
       - name: Output branch name
         run: echo ${BRANCH}
+      - name: Set Selenium base version
+        if: contains(toJson(github.event.commits), '[deploy]') == false
+        run: |
+          make set_nightly_env
+          cat .env | xargs -I {} echo {} >> $GITHUB_ENV
       - name: Sets build date
         run: |
           echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           echo "IMAGE_REGISTRY=artifactory/selenium" >> $GITHUB_ENV
-          make set_nightly_env
-          cat .env | xargs -I {} echo {} >> $GITHUB_ENV
           echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
           AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
@@ -120,6 +123,7 @@ jobs:
         with:
           timeout_minutes: 12
           max_attempts: 3
+          retry_wait_seconds: 60
           command: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
       - name: Setup Kubernetes cluster
         uses: nick-invision/retry@master
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 1f6f41cd4..af22c595f 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -47,7 +47,12 @@ jobs:
       - name: Remove local Docker tag
         run: docker rmi ${{ env.NAME }}/base:local-${BUILD_DATE}
       - name: Build images
-        run: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
+        uses: nick-invision/retry@master
+        with:
+          timeout_minutes: 12
+          max_attempts: 3
+          retry_wait_seconds: 60
+          command: VERSION="${GRID_VERSION}" BUILD_DATE=${BUILD_DATE} make build
       - name: Login Docker Hub
         run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
         env:
diff --git a/.github/workflows/test-video.yml b/.github/workflows/test-video.yml
index c50025117..57e47aef2 100644
--- a/.github/workflows/test-video.yml
+++ b/.github/workflows/test-video.yml
@@ -58,11 +58,14 @@ jobs:
           TARGET_BRANCH: ${{ github.head_ref }}
       - name: Output branch name
         run: echo ${BRANCH}
-      - name: Sets build date
+      - name: Set Selenium base version
+        if: contains(toJson(github.event.commits), '[deploy]') == false
         run: |
-          echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           make set_nightly_env
           cat .env | xargs -I {} echo {} >> $GITHUB_ENV
+      - name: Sets build date
+        run: |
+          echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
           echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
         env:
           AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
@@ -71,6 +74,7 @@ jobs:
         with:
           timeout_minutes: 12
           max_attempts: 3
+          retry_wait_seconds: 60
           command: |
             VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make hub
             VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make chrome
diff --git a/Makefile b/Makefile
index 3e34fa10d..648b44a5d 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.19.0)
-BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.19.1)
-BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.19.0)
+BASE_RELEASE := $(or $(BASE_RELEASE),$(BASE_RELEASE),selenium-4.20.0)
+BASE_VERSION := $(or $(BASE_VERSION),$(BASE_VERSION),4.20.0)
+BINDING_VERSION := $(or $(BINDING_VERSION),$(BINDING_VERSION),4.20.0)
 BASE_RELEASE_NIGHTLY := $(or $(BASE_RELEASE_NIGHTLY),$(BASE_RELEASE_NIGHTLY),nightly)
-BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.20.0-SNAPSHOT)
-VERSION := $(or $(VERSION),$(VERSION),4.19.1)
+BASE_VERSION_NIGHTLY := $(or $(BASE_VERSION_NIGHTLY),$(BASE_VERSION_NIGHTLY),4.21.0-SNAPSHOT)
+VERSION := $(or $(VERSION),$(VERSION),4.20.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/build-backward-compatible/selenium-matrix.yml b/tests/build-backward-compatible/selenium-matrix.yml
index 14aaa4161..41b215e89 100644
--- a/tests/build-backward-compatible/selenium-matrix.yml
+++ b/tests/build-backward-compatible/selenium-matrix.yml
@@ -4,13 +4,22 @@ matrix:
   selenium:
     nightly:
       BASE_RELEASE: nightly
-      BASE_VERSION: 4.20.0-SNAPSHOT
-      VERSION: 4.20.0-SNAPSHOT
+      BASE_VERSION: 4.21.0-SNAPSHOT
+      VERSION: 4.21.0-SNAPSHOT
       BINDING_VERSION: nightly
       CDP:
         - 124
         - 123
         - 122
+    4.20.0:
+      BASE_RELEASE: selenium-4.20.0
+      BASE_VERSION: 4.20.0
+      VERSION: 4.20.0
+      BINDING_VERSION: 4.20.0
+      CDP:
+        - 124
+        - 123
+        - 122
     4.19.1:
       BASE_RELEASE: selenium-4.19.0
       BASE_VERSION: 4.19.1