Correctly create custom apps

[merge]