diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index e8964c906..000000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Babel==2.6.0
-Flask==1.1.0
-PyYAML==5.3.1
-SQLAlchemy==1.2.19
-alembic==1.4.2
-automaton==1.9.0
-bandit==1.1.0
-cliff==3.3.0
-construct==2.9.39
-coverage==4.0
-dogpile.cache==0.9.2
-eventlet==0.26.0
-fixtures==3.0.0
-futurist==1.2.0
-ironic-lib==4.3.0
-jsonpath-rw==1.2.0
-jsonschema==3.2.0
-keystoneauth1==4.2.0
-keystonemiddleware==4.18.0
-netaddr==0.7.18
-openstacksdk==0.40.0
-oslo.concurrency==3.26.0
-oslo.config==6.8.0
-oslo.context==2.22.0
-oslo.db==6.0.0
-oslo.i18n==3.20.0
-oslo.log==4.3.0
-oslo.messaging==5.32.0
-oslo.middleware==3.31.0
-oslo.policy==3.7.0
-oslo.rootwrap==5.8.0
-oslo.serialization==2.25.0
-oslo.service==1.31.0
-oslo.upgradecheck==1.2.0
-oslo.utils==4.5.0
-oslotest==3.2.0
-pbr==3.1.1
-pymemcache==1.2.9
-pytz==2013.6
-stestr==1.0.0
-stevedore==1.20.0
-tenacity==6.2.0
-tooz==2.5.1
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index e2b8adcc8..d09d388b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,7 @@
+# Requirements lower bounds listed here are our best effort to keep them up to
+# date but we do not test them so no guarantee of having them all correct. If
+# you find any incorrect lower bounds, let us know or propose a fix.
+
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
diff --git a/tox.ini b/tox.ini
index a90900a57..01bb819ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -111,12 +111,6 @@ commands =
   sphinx-build -b latex doc/source doc/build/pdf
   make -C doc/build/pdf
 
-[testenv:lower-constraints]
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
-
 [testenv:bandit]
 usedevelop = False
 deps =
diff --git a/zuul.d/ironic-inspector-jobs.yaml b/zuul.d/ironic-inspector-jobs.yaml
index 1fc9eb336..9f2a54b73 100644
--- a/zuul.d/ironic-inspector-jobs.yaml
+++ b/zuul.d/ironic-inspector-jobs.yaml
@@ -55,6 +55,7 @@
       tempest_test_timeout: 3600
       devstack_localrc:
         BUILD_TIMEOUT: 3600
+        IRONIC_BOOT_MODE: bios
         IRONIC_DEFAULT_BOOT_OPTION: netboot
         IRONIC_INSPECTOR_STANDALONE: False
         IRONIC_TEMPEST_BUILD_TIMEOUT: 3600
@@ -120,11 +121,16 @@
     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
           VIRT_DRIVER: ironic
           BUILD_TIMEOUT: 1200
+          IRONIC_TEMPEST_BUILD_TIMEOUT: 1200
           IRONIC_BAREMETAL_BASIC_OPS: True
           IRONIC_BUILD_DEPLOY_RAMDISK: False
           IRONIC_CALLBACK_TIMEOUT: 600
@@ -133,7 +139,7 @@
           IRONIC_INSPECTOR_BUILD_RAMDISK: False
           IRONIC_RAMDISK_TYPE: tinyipa
           IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
-          IRONIC_VM_COUNT: 3
+          IRONIC_VM_COUNT: 4
           IRONIC_VM_EPHEMERAL_DISK: 1
           IRONIC_VM_SPECS_RAM: 1024
           IRONIC_AUTOMATED_CLEAN_ENABLED: False
@@ -149,7 +155,7 @@
       grenade_localrc:
         BASE_RUN_SMOKE: False
       grenade_tempest_concurrency: 1
-      grenade_test_timeout: 2400
+      grenade_test_timeout: 2600
       devstack_plugins:
         ironic: https://opendev.org/openstack/ironic
         ironic-inspector: https://opendev.org/openstack/ironic-inspector
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 74e77b4dc..338052288 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,7 +2,6 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-lower-constraints-master-branch-jobs
       - openstack-python3-zed-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3