fix build steps to reduce conflict against updates