diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 1119fb6080..e8ee49d939 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -108,6 +108,9 @@ resources:
     properties:
       name: {list_join: [".", ["tripleo", {get_param: stack_name}, "workflowtasks", "step{{step}}"]]}
       type: direct
+      tags:
+      - tripleo-heat-templates-managed
+      - {get_param: stack_name}
       tasks:
         yaql:
           expression: $.data.where($ != '').select($.get('step{{step}}')).where($ != null).flatten()