diff --git a/tasks/drivers/kvm/nova_compute_kvm.yml b/tasks/drivers/kvm/nova_compute_kvm.yml
index 9e87dca9..1b83b0cf 100644
--- a/tasks/drivers/kvm/nova_compute_kvm.yml
+++ b/tasks/drivers/kvm/nova_compute_kvm.yml
@@ -174,6 +174,25 @@
     - nova-kvm
     - nova-libvirt
 
+# NOTE(noonedeadpunk): Workaround RHEL bug with edk2-ovmf until they got it released upstream
+#                      Issue has been reproduced with edk2-ovmf-20200602gitca407c7246bf-5.el8.noarch.rpm
+#                      https://bugzilla.redhat.com/show_bug.cgi?id=1961562#c16
+- name: Disable new UEFI firmware
+  when:
+    - ansible_facts['os_family'] | lower == 'redhat'
+    - ansible_facts['distribution_version'] is version('8.3', '<')
+  block:
+    - name: Create qemu firmware directory
+      file:
+        path: /etc/qemu/firmware
+        state: directory
+        recurse: true
+
+    - name: Create empty edk2-ovmf config
+      file:
+        path: /etc/qemu/firmware/50-edk2-ovmf-cc.json
+        state: touch
+
 - name: Set qemu-kvm KSM config (Ubuntu)
   lineinfile:
     dest: "/etc/default/qemu-kvm"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1319534b..d9a9cf24 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -16,7 +16,7 @@
 - project:
     templates:
       - check-requirements
-      - openstack-ansible-linters
+      - openstack-ansible-linters-jobs
       - openstack-ansible-deploy-aio_metal-jobs
       - openstack-ansible-deploy-aio_distro_metal-jobs
       - publish-openstack-docs-pti