diff --git a/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml b/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml
index 4a0d7fe7..a58e5cee 100644
--- a/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml
+++ b/leap-upgrades/upgrade-utilities/neutron-remove-old-containers.yml
@@ -43,3 +43,4 @@
         /opt/neutron-ha-tool.py --replicate-dhcp --now --insecure
       args:
         executable: /bin/bash
+      when: (neutron_legacy_ha_tool_enabled | default('no')) | bool