Merge "Improve policy Config fix for docker-compose"