Use more variable sources when templating the play ds

Fixes #9699