Remove cfg container and go full global