Merge branch 'fix-docker-compose-changes' into 'develop'

Fixed bug => DONE

See merge request !30
7 jobs for develop in 10 minutes and 53 seconds (queued for 10 seconds)