diff --git a/.github/actions/setup-firefox/action.yml b/.github/actions/setup-firefox/action.yml
index 0e903f5426d64..fe0bda3e5bc91 100644
--- a/.github/actions/setup-firefox/action.yml
+++ b/.github/actions/setup-firefox/action.yml
@@ -12,9 +12,5 @@ runs:
       uses: browser-actions/setup-firefox@latest
       with:
         firefox-version: ${{ inputs.version }}
-    - name: Check GeckoDriver
-      run: geckodriver --version
-      shell: bash
-# Deactivating until https://github.com/mozilla/geckodriver/issues/2009 gets fixed
-#    - name: Setup GeckoDriver
-#      uses: browser-actions/setup-geckodriver@latest
+    - name: Setup geckodriver
+      uses: browser-actions/setup-geckodriver@latest
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
index 9e39a0d0b9961..a7f504b1b5941 100644
--- a/.github/workflows/ci-python.yml
+++ b/.github/workflows/ci-python.yml
@@ -179,10 +179,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
-      - name: Setup Firefox
-        uses: browser-actions/setup-firefox@latest
-      - name: Setup GeckoDriver
-        uses: browser-actions/setup-geckodriver@latest
+      - name: Setup Firefox and GeckoDriver
+        uses: ./.github/actions/setup-firefox
       - name: Start XVFB
         run: Xvfb :99 &
       - name: Run browser tests in Firefox (Remote)
@@ -219,10 +217,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
-      - name: Setup Firefox
-        uses: browser-actions/setup-firefox@latest
-      - name: Setup GeckoDriver
-        uses: browser-actions/setup-geckodriver@latest
+      - name: Setup Firefox and GeckoDriver
+        uses: ./.github/actions/setup-firefox
       - name: Start XVFB
         run: Xvfb :99 &
       - name: Run browser tests in Firefox
diff --git a/.github/workflows/ci-ruby.yml b/.github/workflows/ci-ruby.yml
index 35e5f312fbc11..4e0e6b35cd0a7 100644
--- a/.github/workflows/ci-ruby.yml
+++ b/.github/workflows/ci-ruby.yml
@@ -107,10 +107,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-bazel-ruby-${{ matrix.target }}-
       - uses: ./.github/actions/setup-bazelisk
-      - name: Setup Firefox
-        uses: browser-actions/setup-firefox@latest
-      - name: Setup GeckoDriver
-        uses: browser-actions/setup-geckodriver@latest
+      - name: Setup Firefox and GeckoDriver
+        uses: ./.github/actions/setup-firefox
       - run: Xvfb :99 &
       - uses: ./.github/actions/bazel
         with: