Improve playbook
Background
Playbook needed some improvements to ensure the execution without errors.
Related issue: Infrastructure#13985
Playbook needed some improvements to ensure the execution without errors.
Related issue: Infrastructure#13985