Update playbook with improvements