Updated Build-and-Deploy Core Sripts