diff --git a/playbooks/kayobe-seed-base/bifrost-overrides.yml.j2 b/playbooks/kayobe-seed-base/bifrost-overrides.yml.j2
deleted file mode 100644
index 0ada56a2f..000000000
--- a/playbooks/kayobe-seed-base/bifrost-overrides.yml.j2
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# Don't build an IPA deployment image, instead download upstream images.
-create_ipa_image: false
-download_ipa: true
-
-# Don't build a disk image. It takes time and can be unreliable.
-use_cirros: true
diff --git a/playbooks/kayobe-seed-base/pre.yml b/playbooks/kayobe-seed-base/pre.yml
index 8062ff5a0..1d4bc5e9a 100644
--- a/playbooks/kayobe-seed-base/pre.yml
+++ b/playbooks/kayobe-seed-base/pre.yml
@@ -30,11 +30,6 @@
         path: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost"
         state: "directory"
 
-    - name: Ensure bifrost overrides file exists
-      template:
-        src: bifrost-overrides.yml.j2
-        dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost/bifrost.yml"
-
     - name: Ensure kayobe is installed
       shell:
         cmd: dev/install.sh &> {{ logs_dir }}/ansible/install
diff --git a/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2 b/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2
index 0ada56a2f..b429c01c1 100644
--- a/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2
+++ b/playbooks/kayobe-seed-upgrade-base/bifrost-overrides.yml.j2
@@ -1,7 +1,7 @@
 ---
-# Don't build an IPA deployment image, instead download upstream images.
+# Don't build an IPA deployment image.
 create_ipa_image: false
-download_ipa: true
+download_ipa: false
 
 # Don't build a disk image. It takes time and can be unreliable.
-use_cirros: true
+create_image_via_dib: false