diff --git a/docker/rivet-sherpa/Dockerfile b/docker/rivet-sherpa/Dockerfile
--- a/docker/rivet-sherpa/Dockerfile
+++ b/docker/rivet-sherpa/Dockerfile
@@ -1,25 +1,44 @@
-FROM hepstore/rivet:2.7.1
+FROM hepstore/rivet:3.0.1
 MAINTAINER Andy Buckley <andy.buckley@cern.ch>
 
-RUN dnf install -y rsync
+RUN dnf install -y rsync git pypy
 
 RUN mkdir /code && cd /code \
-    && wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.1.tar.gz -O- | tar xz \
+    && 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 cd /usr/local \
+    && git clone https://gitlab.com/openloops/OpenLoops.git \
+    && cd OpenLoops && ./scons \
+    && ./openloops libinstall ppll pptt
 
 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 \
+    && git clone -b rel-2-2-7 https://gitlab.com/sherpa-team/sherpa.git \
+    && dnf install -y libtool openmpi-devel swig sqlite-devel texinfo \
+    && cd sherpa && autoreconf -fi \
+    && ./configure --prefix=/usr/local \
+      --enable-lhapdf=/usr/local --enable-fastjet=/usr/local \
+      --enable-hepmc2=/usr/local --enable-openloops=/usr/local/OpenLoops \
+      --enable-pyext --enable-gzip \
+      --enable-mpi CC=mpicc CXX=mpic++ \
+    && make -j2 CXXFLAGS="-O2 -std=c++11" AM_CXXFLAGS="-O2 -std=c++11" \
+    && make install \
+    && mkdir /usr/local/Sherpa \
+    && mv Examples /usr/local/Sherpa \
     && cd ../.. && rm -r /code
+#--enable-analysis 
+
+# RUN apt-get update; \
+# apt-get -q -y --no-install-recommends install pypy; \
+# apt autoremove; apt-get autoclean; \
+# rm -rf /var/lib/apt/lists /var/cache/apt; \
+# rm -rf $(find / -name doc 2>&1 | grep -v Permission)
+
+# RUN echo "export PATH=/usr/local/bin:\$PATH\n\
+# export LD_LIBRARY_PATH=/usr/local/lib:\$LD_LIBRARY_PATH\n\
+# . /usr/local/rivetenv.sh\n\
+# if [ "\$PS1" ]; then PS1='\\h:\\w\\$ '; fi" > /etc/bash.bashrc
 
 WORKDIR /work
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
+FROM fedora:30
 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/3.0.1/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