Parametrized app name and fixed branching