diff --git a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
index f496766d7..cb1291f12 100644
--- a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
+++ b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
@@ -73,6 +73,10 @@ noauth_mode: true
 # Enable discovery of nodes in Ironic Inspector.
 enable_inspector_discovery: true
 
+# Disable cleaning for backwards compatibility. It is enabled by default in
+# Bifrost since the Victoria release.
+cleaning: false
+
 {% if kolla_bifrost_extra_globals %}
 ###############################################################################
 # Extra configuration
diff --git a/releasenotes/notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml b/releasenotes/notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml
new file mode 100644
index 000000000..f2053217e
--- /dev/null
+++ b/releasenotes/notes/disable-bifrost-cleaning-ff10995a0bf11079.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    Until the Victoria release, Bifrost disabled node cleaning, however it
+    became enabled in Victoria. To maintain backward compatibility, Kayobe now
+    modifies the configuration in Bifrost to disable node cleaning of overcloud
+    hosts.