Move the ONBUILD triggers to a separate Dockerfile for a new set of tags