Use shared services in the container
Merge remote-tracking branch 'origin/feature/shared-services', resolves #49

* origin/feature/shared-services:
  Use shared services in the container