Originally I worked on this for the multi-stage build Dockerfile changes. Decided to split this out as we are still waiting for multi-stage to be available on CI and rebasing these is pretty annoying. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit b529d1b0936b90ae14d584c73f7332919f8d76b7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>