This reverts commit 648caa4dd4.
648caa4dd4
This commit also includes the required format changes to ensure that we can push from docker compose. This means that we needed to update the docker-compose.yml files to version 2.0