Use the entries in the databag instead of a hardcoded list
Remove upstream as that is not needed in our setup
Since we don't use upstream, remove related code.

The @app is not used, proxy stuff unused and some default settings
removed
Merge branch 'feature/upstream' into develop

* feature/upstream:
  Since we don't use upstream, remove related code.
  Remove upstream as that is not needed in our setup