Maven build install + image refactoring