diff --git a/lower-constraints.txt b/lower-constraints.txt
index b51252aa28..fd35cddb78 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,14 +1,17 @@
 alembic==1.4.2
 automaton==1.9.0
+Babel==2.6.0
 bandit==1.1.0
+cliff==3.3.0
 coverage==4.0
 ddt==1.2.1
+dogpile.cache==0.9.2
 eventlet==0.18.2
 fixtures==3.0.0
 futurist==1.2.0
 ironic-lib==4.6.1
 iso8601==0.1.11
-Jinja2==2.10
+Jinja2==3.0.0
 jsonpatch==1.16
 jsonschema==3.2.0
 keystoneauth1==4.2.0
diff --git a/requirements.txt b/requirements.txt
index ea11b920d0..bae599bcbe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,7 +33,7 @@ pycdlib>=1.11.0 # LGPLv2
 requests>=2.18.0 # Apache-2.0
 rfc3986>=1.2.0 # Apache-2.0
 jsonpatch!=1.20,>=1.16 # BSD
-Jinja2>=2.10 # BSD License (3 clause)
+Jinja2>=3.0.0 # BSD License (3 clause)
 keystonemiddleware>=4.17.0 # Apache-2.0
 oslo.messaging>=5.29.0 # Apache-2.0
 tenacity>=6.2.0  # Apache-2.0
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index ff7727b7a3..0271a469a1 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -831,6 +831,10 @@
     vars:
       grenade_devstack_localrc:
         shared:
+          #NOTE: when in UEFI mode, TFTP packets don't get tracked nor
+          #pass between original and upgrade networks. Switch to BIOS
+          #until we can fix this properly.
+          IRONIC_BOOT_MODE: bios
           DEFAULT_INSTANCE_TYPE: baremetal
           FORCE_CONFIG_DRIVE: True
           INSTALL_TEMPEST: False