diff --git a/docker/rivet-pythia/Dockerfile b/docker/rivet-pythia/Dockerfile
--- a/docker/rivet-pythia/Dockerfile
+++ b/docker/rivet-pythia/Dockerfile
@@ -1,27 +1,25 @@
 FROM hepstore/rivet:2.7.0
 MAINTAINER Andy Buckley <andy.buckley@cern.ch>
 
 RUN dnf install -y rsync
-RUN mkdir /code
 
-# TODO: combine RUN rules to avoid the large intermediate layers
+RUN mkdir /code && cd /code \
+    && wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.1.tar.gz -O- | tar xz \
+    && cd LHAPDF-*/ && ./configure --prefix=/usr/local \
+    && make -j5 && make install \
+    && cd ../.. && rm -r /code
 
-RUN cd /code && \
-    wget https://www.hepforge.org/archive/lhapdf/LHAPDF-6.2.1.tar.gz -O- | tar xz && \
-    cd LHAPDF-*/ && ./configure --prefix=/usr/local && \
-    make -j5 && make install
+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 /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
-
-RUN cd code/ && \
-    wget https://www.hepforge.org/archive/agile/Sacrifice-1.1.1b.tar.gz -O- | tar xz && \
-    cd Sacrifice-*/ && \
-    ./configure --{prefix,with-{pythia,hepmc,LHAPDF}}=/usr/local && \
-    make -j5 && make install
-
-RUN rm -rf /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,10 +1,8 @@
 FROM hepstore/rivet-pythia
 MAINTAINER Andy Buckley <andy.buckley@cern.ch>
 
 CMD /bin/bash
 
 WORKDIR /work
 
 ADD . /work
-
-#RUN yum install -y nano