diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04476011..1ecb9fe8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, ubuntu-20.04, macos-latest, macos-11 ]
         branch:
-          - 'master'
+          # - 'master'
           - 'now'
         chrome_version:
           - 'current'
@@ -80,7 +80,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest, ubuntu-20.04, macos-latest, macos-11 ]
         branch:
-          - 'master'
+          # - 'master'
           - 'now'
     steps:
     - uses: actions/checkout@v3
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 962b0881..7c985c57 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -22,7 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, windows-2019 ]
-        branch: [ 'master', 'now' ]
+        branch:
+          # - 'master'
+          - 'now'
     steps:
     - uses: actions/checkout@v3
     - shell: pwsh
@@ -69,7 +71,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ windows-latest, windows-2019 ]
-        branch: [ 'master', 'now' ]
+        branch:
+          # - 'master'
+          - 'now'
     steps:
     - uses: actions/checkout@v3
     - shell: pwsh
diff --git a/lib/setup-chromedriver.sh b/lib/setup-chromedriver.sh
index adf93a7b..8108a80b 100755
--- a/lib/setup-chromedriver.sh
+++ b/lib/setup-chromedriver.sh
@@ -62,6 +62,12 @@ else
 
     echo "Installing ChromeDriver $VERSION for $ARCH"
     URL=$(curl  --location --fail --retry 10 https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json | jq -r ".versions[] | select(.version == \"${VERSION}\") | .downloads.chromedriver[] | select(.platform == \"${ARCH}\") | .url")
+    if [ "$URL" == "" ]; then
+        echo "Fallback to latest version of ChromeDriver for $ARCH"
+        VERSION=$(curl  --location --fail --retry 10 https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json | jq -r ".versions[] | select(.version | startswith(\"$(echo $VERSION | cut -d '.' -f1-3).\")) | .version" | tail -1)
+        URL=$(curl  --location --fail --retry 10 https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json | jq -r ".versions[] | select(.version == \"${VERSION}\") | .downloads.chromedriver[] | select(.platform == \"${ARCH}\") | .url")
+        echo "Installing ChromeDriver $VERSION for $ARCH"
+    fi
     echo "Downloading $URL"
     curl --location --fail --retry 10 -O "$URL"
     unzip -o -q chromedriver-${ARCH}.zip