Using docker build args greatly reduces code duplication.
Also reduced the manual effort to build and push the images. And removed the already installed `zip` apt package.