These changes are keeping fallback to old settings, but will allow to run multiple git targets with different settings