Use only one (templated) docker file for both builds. Move to two-stage container builds in order to save space in the final image.
This caused our AWX release workflow to blow up