Some changes to allow provisionin inside a docker container