Re-adding Ryan's Playbooks config changes

These additions got lost in the recent refactoring.