It seems all our good stuff here was merged in the templates, try it
out and see if it fixes our current pipeline failures.