diff --git a/docker/rivet-pythia/Dockerfile b/docker/rivet-pythia/Dockerfile
--- a/docker/rivet-pythia/Dockerfile
+++ b/docker/rivet-pythia/Dockerfile
@@ -1,25 +1,25 @@
-FROM hepstore/rivet:2.7.2
+FROM hepstore/rivet:3.0.0
 MAINTAINER Andy Buckley <andy.buckley@cern.ch>
 
 RUN dnf install -y rsync
 
 RUN mkdir /code && cd /code \
     && wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.3.tar.gz -O- | tar xz \
     && cd LHAPDF-*/ && ./configure --prefix=/usr/local \
     && make -j5 && make install \
     && cd ../.. && rm -r /code
 
 RUN mkdir /code && cd /code \
     && wget http://home.thep.lu.se/~torbjorn/pythia8/pythia8240.tgz -O- | tar xz \
     && cd pythia*/ && ./configure --enable-shared --{prefix,with-{hepmc2,lhapdf6}}=/usr/local \
     && make -j5 && make install \
     && cd ../.. && rm -r /code
 
 RUN mkdir /code && cd /code \
     && wget https://agile.hepforge.org/downloads/?f=Sacrifice-1.1.2.tar.gz -O- | tar xz \
     && cd Sacrifice-*/ \
     && ./configure --{prefix,with-{pythia,hepmc,LHAPDF}}=/usr/local \
     && make -j5 && make install \
     && cd ../.. && rm -r /code
 
 WORKDIR /work
diff --git a/docker/rivet-tutorial/Dockerfile b/docker/rivet-tutorial/Dockerfile
--- a/docker/rivet-tutorial/Dockerfile
+++ b/docker/rivet-tutorial/Dockerfile
@@ -1,9 +1,9 @@
-FROM hepstore/rivet-pythia
+FROM hepstore/rivet-pythia:3.0.0-8240
 MAINTAINER Andy Buckley <andy.buckley@cern.ch>
 
 CMD /bin/bash
 
 WORKDIR /work
 
 ADD . /work
 RUN rm /work/Dockerfile
diff --git a/docker/rivet/Dockerfile b/docker/rivet/Dockerfile
--- a/docker/rivet/Dockerfile
+++ b/docker/rivet/Dockerfile
@@ -1,26 +1,26 @@
 FROM fedora:27
 LABEL maintainer="rivet@projects.hepforge.org"
 
 RUN dnf update -y \
     && dnf install -y \
       make gcc-c++ gcc-gfortran redhat-rpm-config \
       wget tar less bzip2 findutils which nano zlib-devel \
       python python-devel python-requests file python-matplotlib gsl-devel \
       texlive-latex-bin texlive-texconfig-bin texlive-pst-tools \
       ghostscript ImageMagick texlive-dvips texlive-relsize \
       texlive-cm texlive-hyphen-base texlive-collection-fontsrecommended \
     && dnf clean all
 
 RUN mkdir /code && cd /code \
-    && wget https://phab.hepforge.org/source/rivetbootstraphg/browse/2.7.2/rivet-bootstrap?view=raw -O rivet-bootstrap \
+    && wget https://phab.hepforge.org/source/rivetbootstraphg/browse/3.0.0/rivet-bootstrap?view=raw -O rivet-bootstrap \
     && chmod +x rivet-bootstrap \
     && INSTALL_PREFIX=/usr/local INSTALL_GSL=0 INSTALL_RIVETDEV=0 MAKE="make -j7" ./rivet-bootstrap \
     && echo "source /usr/local/share/Rivet/rivet-completion" > /etc/profile.d/rivet-completion.sh \
     && echo "source /usr/local/share/YODA/yoda-completion" > /etc/profile.d/yoda-completion.sh \
     && texconfig rehash \
     && rm -rf /code
 
 ENV LD_LIBRARY_PATH /usr/local/lib
 ENV PYTHONPATH /usr/local/lib64/python2.7/site-packages
 
 WORKDIR /work