diff --git a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
index eb5cf82a2..ab9d640d4 100644
--- a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
+++ b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
@@ -46,6 +46,21 @@ ipa_kernel_upstream_url: "{{ kolla_bifrost_ipa_kernel_upstream_url }}"
 # URL of checksum of Ironic Python Agent (IPA) kernel image.
 ipa_kernel_upstream_checksum_url: "{{ kolla_bifrost_ipa_kernel_checksum_url }}"
 
+# NOTE(mgoddard): In bifrost 7.1.0, the default for ipa_kernel and
+# ipa_kernel_url was changed from .vmlinuz to .kernel. This broke our inspector
+# rule which uses .vmlinuz when setting driver_info.deploy_kernel. It will also
+# break existing nodes if the IPA kernel is updated e.g. following an upgrade.
+# Use the old value of .vmlinuz here.
+# TODO(mgoddard): Remove these when we use IPA builder.
+{# Using double jinja escaping here since this will be templated by kayobe #}
+{# and kolla ansible, then interpreted as Ansible variables by Bifrost. #}
+{{ '{% raw %}' }}
+{% raw %}
+ipa_kernel: "{{http_boot_folder}}/ipa.vmlinuz"
+ipa_kernel_url: "{{ ipa_file_protocol }}://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface]['ipv4']['address'] }}:{{file_url_port}}/ipa.vmlinuz"
+{% endraw %}
+{{ '{% endraw %}' }}
+
 # Algorithm of checksum of Ironic Python Agent (IPA) kernel image.
 ipa_kernel_upstream_checksum_algo: "{{ kolla_bifrost_ipa_kernel_checksum_algorithm }}"
 
diff --git a/releasenotes/notes/workaround-bifrost-ipa-kernel-rename-59bf75ac8285f103.yaml b/releasenotes/notes/workaround-bifrost-ipa-kernel-rename-59bf75ac8285f103.yaml
new file mode 100644
index 000000000..979954bfa
--- /dev/null
+++ b/releasenotes/notes/workaround-bifrost-ipa-kernel-rename-59bf75ac8285f103.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue seen during overcloud provisioning due to Bifrost renaming
+    the IPA kernel file. See `story 2007068
+    <https://storyboard.openstack.org/#!/story/2007068>`__ for details.