Reverted to stand-alone build container