diff --git a/zuul.d/ironic-inspector-jobs.yaml b/zuul.d/ironic-inspector-jobs.yaml
index 1fc9eb336..a896d503e 100644
--- a/zuul.d/ironic-inspector-jobs.yaml
+++ b/zuul.d/ironic-inspector-jobs.yaml
@@ -120,11 +120,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 +138,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 +154,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