[CLC-1216] Update-build script fixes

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1216

Not too thrilled about the env variable situation, will comment in JIRA.