Merge branch 'fixes' into 'milestone-2'

fix: docker containers, rename microservice4

See merge request !32