More attempts at fixing derpy bamboo builds