Fix build steps to avoid timeouts