diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index db01815..0e2a669 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -180,9 +180,10 @@
   condition:
     yaql_exp: >
       $.get('detach-murano', {}).get('metadata', {}).get('enabled', false) and
-      $.murano.enabled and $.network_metadata.nodes.values().any(
+      $.network_metadata.nodes.values().any(
          ('murano-node' in $.node_roles) or
-         ('primary-murano-node' in $.node_roles))
+         ('primary-murano-node' in $.node_roles)) and ($.murano.enabled or
+      changedAny($.murano.enabled))
   required_for: [murano-controller-end]
   parameters:
     puppet_manifest: manifests/murano_disable_old.pp