Updates to workdir & volume