Adapt buildbot to new flexibility