Simplify app template

to avoid bad container states and to install fewer packages
Merge branch 'update-app-template' into add-docker-login