If I understand this 3 teams run ember deploy to the same destination. Embedding multiple apps in your base app can perhaps be solved by using semver for all team ember addons. Each team will have to increase there ember addon’s version if they deploy the app. Perhaps use https://www.npmjs.com/enterprise to manage this. If each team runs git fetch remotebase and git merge remotebase/master and runs npm install before ember deploy it will be manageable? Just thinking.