Multiple builds through same pipeline

This PR will fix the currently failing case where you have multiple builds with the same pipeline.