diff --git a/containers/Dockerfile-test-suite-python27 b/containers/Dockerfile-test-suite-python27
index 3b22c7eb0b35982e760705be6319909efca9dcda..1cab8096ef73af3af58a7b39fa8365621e41e7d4 100644
--- a/containers/Dockerfile-test-suite-python27
+++ b/containers/Dockerfile-test-suite-python27
@@ -41,7 +41,7 @@ coverage-badge
 RUN pip install corner lalsuite astropy gwpy theano
 
 # Install samplers
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest
+RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest dnest4
 
 # Install pymultinest requirements
 RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
@@ -55,7 +55,7 @@ ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.11_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
-&& (cd PolyChordLite && make pypolychord  MPI= && python setup.py install)
+&& (cd PolyChordLite && python setup.py --no-mpi install)
 
 # Install PTMCMCSampler
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
diff --git a/containers/Dockerfile-test-suite-python37 b/containers/Dockerfile-test-suite-python37
index 929985c85cec85097ae538a44773db055db06d6c..e1e428d1519ab56dab76d4f4b96bf3fd8f97f896 100644
--- a/containers/Dockerfile-test-suite-python37
+++ b/containers/Dockerfile-test-suite-python37
@@ -48,7 +48,7 @@ RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs
 RUN pip install corner lalsuite astropy gwpy theano healpy
 
 # Install samplers
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest
+RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest dnest4
 
 # Install pymultinest requirements
 RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
@@ -62,7 +62,7 @@ ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.11_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
-&& (cd PolyChordLite && make pypolychord  MPI= && python setup.py install)
+&& (cd PolyChordLite && python setup.py --no-mpi install)
 
 # Install PTMCMCSampler
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
diff --git a/containers/v2-dockerfile-test-suite-python35 b/containers/v2-dockerfile-test-suite-python35
index 252885940676823be25e4f0281fdee317b2d19fc..0dc55a7b1f2b98551e99b5f0875e3e13ee05ce9e 100644
--- a/containers/v2-dockerfile-test-suite-python35
+++ b/containers/v2-dockerfile-test-suite-python35
@@ -35,7 +35,7 @@ RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy cython
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest
+RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest dnest4
 
 # Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
@@ -45,7 +45,7 @@ ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
-&& (cd PolyChordLite && make pypolychord  MPI= && python setup.py install)
+&& (cd PolyChordLite && python setup.py --no-mpi install)
 
 # Install PTMCMCSampler
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
diff --git a/containers/v2-dockerfile-test-suite-python36 b/containers/v2-dockerfile-test-suite-python36
index 40e67bea44a0f2a1928daff84a8b1d0bdb380e35..bce29952b4baeb2608cfb479a52f465688422f84 100644
--- a/containers/v2-dockerfile-test-suite-python36
+++ b/containers/v2-dockerfile-test-suite-python36
@@ -35,7 +35,7 @@ RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy cython
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest
+RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest dnest4
 
 # Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
@@ -45,7 +45,7 @@ ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
-&& (cd PolyChordLite && make pypolychord  MPI= && python setup.py install)
+&& (cd PolyChordLite && python setup.py --no-mpi install)
 
 # Install PTMCMCSampler
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
diff --git a/containers/v2-dockerfile-test-suite-python37 b/containers/v2-dockerfile-test-suite-python37
index f72a28a1eb2c35a25d84f5e539c8cdd613bf63c4..9e2bb9953a76c53f7b634676596f8c8b656a9833 100644
--- a/containers/v2-dockerfile-test-suite-python37
+++ b/containers/v2-dockerfile-test-suite-python37
@@ -35,7 +35,7 @@ RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy cython
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest
+RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest dnest4
 
 # Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
@@ -45,7 +45,7 @@ ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
-&& (cd PolyChordLite && make pypolychord  MPI= && python setup.py install)
+&& (cd PolyChordLite && python setup.py --no-mpi install)
 
 # Install PTMCMCSampler
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
diff --git a/containers/v2-dockerfile-test-suite-python38 b/containers/v2-dockerfile-test-suite-python38
index 8403053e2f0d4ea2414a9c6c0e33d876cc8a03b3..b8b379b0a90ac30fa87a12c48b305d7a31cbf829 100644
--- a/containers/v2-dockerfile-test-suite-python38
+++ b/containers/v2-dockerfile-test-suite-python38
@@ -35,7 +35,7 @@ RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
 RUN pip install corner lalsuite theano healpy cython
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest
+RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 pymultinest kombine ultranest dnest4
 
 # Install multinest
 RUN git clone https://github.com/farhanferoz/MultiNest.git \
@@ -45,7 +45,7 @@ ENV LD_LIBRARY_PATH $HOME/MultiNest/MultiNest_v3.12_CMake/multinest/lib:
 
 # Install Polychord
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
-&& (cd PolyChordLite && make pypolychord  MPI= && python setup.py install)
+&& (cd PolyChordLite && python setup.py --no-mpi install)
 
 # Install PTMCMCSampler
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \