diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 06f8fd3a18..e63d100203 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -10,7 +10,7 @@
 - job:
     name: horizon-selenium-headless
     parent: horizon-openstack-tox-base
-    nodeset: ubuntu-focal
+    nodeset: debian-bullseye
     pre-run: playbooks/horizon-selenium-headless/pre.yaml
     vars:
       tox_envlist: selenium-headless
diff --git a/.zuul.d/nodejs-jobs.yaml b/.zuul.d/nodejs-jobs.yaml
index 25e7a3f2ae..59786bc1bc 100644
--- a/.zuul.d/nodejs-jobs.yaml
+++ b/.zuul.d/nodejs-jobs.yaml
@@ -6,7 +6,7 @@
     vars:
       node_version: 16
       tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
-    nodeset: ubuntu-focal
+    nodeset: debian-bullseye
     pre-run: playbooks/horizon-nodejs/pre.yaml
     required-projects:
       - openstack/horizon
@@ -21,7 +21,7 @@
       node_version: 16
       tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
     pre-run: playbooks/horizon-nodejs/pre.yaml
-    nodeset: ubuntu-focal
+    nodeset: debian-bullseye
     required-projects:
       - openstack/horizon
       - openstack/requirements
diff --git a/.zuul.d/tempest-and-integrated.yaml b/.zuul.d/tempest-and-integrated.yaml
index c33578af0f..21ada7ccc5 100644
--- a/.zuul.d/tempest-and-integrated.yaml
+++ b/.zuul.d/tempest-and-integrated.yaml
@@ -1,7 +1,7 @@
 - job:
     name: horizon-integration-tests
     parent: devstack
-    nodeset: openstack-single-node-focal
+    nodeset: devstack-single-node-debian-bullseye
     pre-run: playbooks/horizon-devstack-integration/pre.yaml
     run: playbooks/horizon-devstack-integration/run.yaml
     post-run: playbooks/horizon-devstack-integration/post.yaml
diff --git a/bindep.txt b/bindep.txt
index 6de4ffdf97..0c3f3dba13 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,6 +1,7 @@
 # selenium tests
 ffmpeg [selenium]
-firefox [selenium]
+firefox [selenium platform:ubuntu]
+firefox-esr [selenium platform:debian]
 xvfb [selenium platform:dpkg]
 # already part of xorg-x11-server on openSUSE
 xorg-x11-server-Xvfb [selenium platform:redhat]
diff --git a/roles/setup-selenium-tests/defaults/main.yaml b/roles/setup-selenium-tests/defaults/main.yaml
index 97ee57cc66..fcbc59a259 100644
--- a/roles/setup-selenium-tests/defaults/main.yaml
+++ b/roles/setup-selenium-tests/defaults/main.yaml
@@ -1,2 +1,2 @@
 ---
-geckodriver_url: "https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz"
+geckodriver_url: "https://github.com/mozilla/geckodriver/releases/download/v0.32.0/geckodriver-v0.32.0-linux64.tar.gz"