Use new base dockers