diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml
index f3c5627..932a03e 100644
--- a/deployment_tasks.yaml
+++ b/deployment_tasks.yaml
@@ -5,7 +5,7 @@
   requires: [top-role-cinder]
   required_for: [deploy_end]
   condition:
-    yaql_exp: "changedAny($.storage, $.cinder_kaminario)"
+    yaql_exp: "changedAny($.cinder, $.get('cinder_volume_group'), $.network_metadata.nodes.get(concat(\"node-\", $.uid)).network_roles.get('cinder/iscsi'), $.network_metadata.vips, $.debug, $.node_volumes, $.storage, $.rabbit, $.ceilometer, $.get('use_stderr'), $.get('use_syslog'), $.get('syslog_log_facility_cinder'), $.get('syslog_log_facility_ceph'), $.get('proxy_port'), $.get('kombu_compression'), $.get('use_ssl'), $.get('service_endpoint'), $.get('glance_api_servers'), $.get('amqp_hosts'), $.network_metadata.nodes.values().where(\n  $.node_roles.any($.matches('controller'))).network_roles.select(\n    $.get('mgmt/messaging')))\n"
   parameters:
     puppet_manifest: puppet/manifests/cinder_kaminario.pp
     puppet_modules:  puppet/modules:/etc/puppet/modules
@@ -17,8 +17,6 @@
   groups: [primary-controller,controller]
   requires: [openstack-cinder]
   required_for: [deploy_end]
-  condition:
-    yaql_exp: "changedAny($.storage, $.cinder_kaminario)"
   parameters:
     puppet_manifest: puppet/manifests/cinder_controller_config.pp
     puppet_modules: puppet/modules:/etc/puppet/modules