Simplify roles, fix nginx settings