Allow custom group IDs for images; Refactor image building; Change SNAPSHOT version to 2.0-SNAPSHOT