Made ci-local more robust
Added work-related git commands to workaround ci issues