diff --git a/manifests/site/test-site/shared/catalogues/hosts.yaml b/manifests/site/test-site/shared/catalogues/hosts.yaml
index ae5936b5b..b7fb6b4cf 100644
--- a/manifests/site/test-site/shared/catalogues/hosts.yaml
+++ b/manifests/site/test-site/shared/catalogues/hosts.yaml
@@ -7,6 +7,7 @@ metadata:
 hosts:
   m3:
     node01:
+      bootMode: UEFI
       macAddress: 52:54:00:b6:ed:31
       bmcAddress: redfish+http://10.23.25.1:8000/redfish/v1/Systems/air-target-1
       bmcUsername: root
@@ -17,9 +18,9 @@ hosts:
       macAddresses:
         oam: 52:54:00:9b:27:4c
         pxe: 52:54:00:b6:ed:31
-      bootMode: legacy
       hardwareProfile: default # defined in the hostgenerator-m3 function
     node02:
+      bootMode: UEFI
       macAddress: 52:54:00:b6:ed:02
       bmcAddress: redfish+http://10.23.25.2:8000/redfish/v1/Systems/air-target-2
       bmcUsername: username
diff --git a/roles/airship-libvirt-gate/tasks/build-infra.yaml b/roles/airship-libvirt-gate/tasks/build-infra.yaml
index 915458e19..7edde6d7a 100644
--- a/roles/airship-libvirt-gate/tasks/build-infra.yaml
+++ b/roles/airship-libvirt-gate/tasks/build-infra.yaml
@@ -70,6 +70,7 @@
     name: libvirt-domain
   vars:
     libvirt_domain:
+      boot_mode: UEFI
       enable_vnc: true
       console_log_enabled: true
       state: shutdown
@@ -99,6 +100,7 @@
     name: libvirt-domain
   vars:
     libvirt_domain:
+      boot_mode: UEFI
       enable_vnc: true
       console_log_enabled: true
       state: shutdown
@@ -167,6 +169,7 @@
     name: libvirt-domain
   vars:
     libvirt_domain:
+      boot_mode: UEFI
       enable_vnc: true
       console_log_enabled: true
       state: shutdown
diff --git a/roles/libvirt-domain/defaults/main.yaml b/roles/libvirt-domain/defaults/main.yaml
index 41c0d3314..0c7a27660 100644
--- a/roles/libvirt-domain/defaults/main.yaml
+++ b/roles/libvirt-domain/defaults/main.yaml
@@ -106,6 +106,9 @@ libvirt_domain_template_default: |
       <on_crash>destroy</on_crash>
       <os>
       <type arch='{{ libvirt_vm_arch }}'{% if machine is not none %} machine='{{ machine }}'{% endif %}>hvm</type>
+      {% if libvirt_domain.boot_mode is defined and libvirt_domain.boot_mode == 'UEFI' %}
+      <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
+      {% endif %}
       <bootmenu enable='no'/>
       <boot dev='hd'/>
       <boot dev='cdrom'/>
diff --git a/roles/libvirt-install/tasks/main.yaml b/roles/libvirt-install/tasks/main.yaml
index 9d050d8dd..d54a44c8c 100644
--- a/roles/libvirt-install/tasks/main.yaml
+++ b/roles/libvirt-install/tasks/main.yaml
@@ -25,7 +25,9 @@
           - python3-libvirt
           - dnsmasq
           - ebtables
+          - ovmf
           RedHat:
+          - edk2-ovmf
           - libguestfs-tools
           - libvirt
           - libvirt-devel