The multiple tags per `docker build -t` was not intended to be part of this pull request. I'll revert these changes from this branch and move it to a separate pull request (with unit tests as well).