Update cibuild script to simplify commands