diff --git a/ansible/roles/bifrost/templates/bifrost.yml.j2 b/ansible/roles/bifrost/templates/bifrost.yml.j2
index 9660050f5c..9c5c2dcc7d 100644
--- a/ansible/roles/bifrost/templates/bifrost.yml.j2
+++ b/ansible/roles/bifrost/templates/bifrost.yml.j2
@@ -20,3 +20,9 @@ network_interface: "{{ bifrost_network_interface }}"
 # during deployment. If we use a directory under /httpboot to store the
 # master images this issue is avoided.
 ironic_tftp_master_path: "/httpboot/master_images"
+
+# Bifrost in Yoga changed the default TFTP and HTTP boot directories to reside
+# under /var/lib/ironic/. Avoid this breaking us by reverting to the previous
+# defaults. https://review.opendev.org/c/openstack/bifrost/+/822743
+tftp_boot_folder: "/tftpboot"
+http_boot_folder: "/httpboot"