Also includes updates to the oneshot container to work with beta-1. The beta-1 container is already pushed to the remote.