diff --git a/playbooks/install.yaml b/playbooks/install.yaml
index a3bcd3b6e..a0cdd6b32 100644
--- a/playbooks/install.yaml
+++ b/playbooks/install.yaml
@@ -34,6 +34,7 @@
       dib_imagetype: "qcow2"
       dib_elements: >
         {{ dib_image_type|default('vm') }}
+        {% if default_boot_mode != "bios" %}block-device-efi{% endif %}
         enable-serial-console
         {{ dib_init_element|default('simple-init') }}
         {{ extra_dib_elements|default('') }}
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 7a487e9a2..b343c05fc 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -80,4 +80,4 @@
         - bifrost-upgrade-keystone-centos8
     experimental:
       jobs:
-        - bifrost-benchmark-ironic
+        - bifrost-benchmark-ironic
\ No newline at end of file