diff --git a/containers/dockerfile-template b/containers/dockerfile-template
index 82354c22f95190242a5e34cd4da67ab6767583f4..9e39a44712ca2d75d80c56295b4e379c27bc7694 100644
--- a/containers/dockerfile-template
+++ b/containers/dockerfile-template
@@ -13,31 +13,34 @@ RUN /bin/bash -c "source activate ${{conda_env}}"
 RUN conda info
 RUN python --version
 
-# Install pymultinest requirements
-RUN apt-get update --allow-releaseinfo-change
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
 # Install conda-installable programs
 RUN conda install -n ${{conda_env}} -y matplotlib numpy scipy pandas astropy flake8 mock
 RUN conda install -n ${{conda_env}} -c anaconda coverage configargparse future
-
-# Install conda-forge-installable programs
-RUN conda install -n ${{conda_env}} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
+RUN conda install -n ${{conda_env}} -c conda-forge black pytest-cov deepdish arviz
 
 # Install pip-requirements
 RUN pip install --upgrade pip
-RUN pip install --upgrade setuptools coverage-badge
+RUN pip install --upgrade setuptools coverage-badge parameterized
 
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
-RUN pip install corner lalsuite theano healpy cython tables
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc
+RUN pip install corner theano healpy cython tables
+RUN conda install -n ${{conda_env}} -c conda-forge dynesty emcee nestle ptemcee
 RUN conda install -n ${{conda_env}} -c conda-forge pymultinest ultranest
+RUN conda install -n ${{conda_env}} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
+RUN conda install -n ${{conda_env}} -c conda-forge pytorch
+RUN pip install nessai
 
 # Install Polychord
+RUN apt-get update --allow-releaseinfo-change
+RUN apt-get install -y build-essential
+RUN apt-get install -y libblas3 libblas-dev
+RUN apt-get install -y liblapack3 liblapack-dev
+RUN apt-get install -y libatlas3-base libatlas-base-dev
+RUN apt-get install -y gfortran
+
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 && (cd PolyChordLite && python setup.py --no-mpi install)
 
@@ -45,6 +48,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
 && (cd PTMCMCSampler && python setup.py install)
 
+# Install GW packages
+RUN conda install -n ${{conda_env}} -c conda-forge python-lalsimulation
+RUN pip install ligo-gracedb gwpy ligo.skymap
+
 # Add the ROQ data to the image
 RUN mkdir roq_basis \
     && cd roq_basis \
diff --git a/containers/v3-dockerfile-test-suite-python37 b/containers/v3-dockerfile-test-suite-python37
index b633f76f8f237421793518add92348a7c53804a5..5cc658beed0fff90e0772605552cf40b1872014f 100644
--- a/containers/v3-dockerfile-test-suite-python37
+++ b/containers/v3-dockerfile-test-suite-python37
@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}"
 RUN conda info
 RUN python --version
 
-# Install pymultinest requirements
-RUN apt-get update --allow-releaseinfo-change
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
 # Install conda-installable programs
 RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock
 RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
-
-# Install conda-forge-installable programs
-RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
+RUN conda install -n ${conda_env} -c conda-forge black pytest-cov deepdish arviz
 
 # Install pip-requirements
 RUN pip install --upgrade pip
-RUN pip install --upgrade setuptools coverage-badge
+RUN pip install --upgrade setuptools coverage-badge parameterized
 
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
-RUN pip install corner lalsuite theano healpy cython tables
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc
+RUN pip install corner theano healpy cython tables
+RUN conda install -n ${conda_env} -c conda-forge dynesty emcee nestle ptemcee
 RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest
+RUN conda install -n ${conda_env} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
+RUN conda install -n ${conda_env} -c conda-forge pytorch
+RUN pip install nessai
 
 # Install Polychord
+RUN apt-get update --allow-releaseinfo-change
+RUN apt-get install -y build-essential
+RUN apt-get install -y libblas3 libblas-dev
+RUN apt-get install -y liblapack3 liblapack-dev
+RUN apt-get install -y libatlas3-base libatlas-base-dev
+RUN apt-get install -y gfortran
+
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 && (cd PolyChordLite && python setup.py --no-mpi install)
 
@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
 && (cd PTMCMCSampler && python setup.py install)
 
+# Install GW packages
+RUN conda install -n ${conda_env} -c conda-forge python-lalsimulation
+RUN pip install ligo-gracedb gwpy ligo.skymap
+
 # Add the ROQ data to the image
 RUN mkdir roq_basis \
     && cd roq_basis \
diff --git a/containers/v3-dockerfile-test-suite-python38 b/containers/v3-dockerfile-test-suite-python38
index 98d03802ba11a15480d1ccd2d9065a054f18fe9c..c742175534f4673de11a3978a98edac350e2dd63 100644
--- a/containers/v3-dockerfile-test-suite-python38
+++ b/containers/v3-dockerfile-test-suite-python38
@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}"
 RUN conda info
 RUN python --version
 
-# Install pymultinest requirements
-RUN apt-get update --allow-releaseinfo-change
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
 # Install conda-installable programs
 RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock
 RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
-
-# Install conda-forge-installable programs
-RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
+RUN conda install -n ${conda_env} -c conda-forge black pytest-cov deepdish arviz
 
 # Install pip-requirements
 RUN pip install --upgrade pip
-RUN pip install --upgrade setuptools coverage-badge
+RUN pip install --upgrade setuptools coverage-badge parameterized
 
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
-RUN pip install corner lalsuite theano healpy cython tables
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc
+RUN pip install corner theano healpy cython tables
+RUN conda install -n ${conda_env} -c conda-forge dynesty emcee nestle ptemcee
 RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest
+RUN conda install -n ${conda_env} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
+RUN conda install -n ${conda_env} -c conda-forge pytorch
+RUN pip install nessai
 
 # Install Polychord
+RUN apt-get update --allow-releaseinfo-change
+RUN apt-get install -y build-essential
+RUN apt-get install -y libblas3 libblas-dev
+RUN apt-get install -y liblapack3 liblapack-dev
+RUN apt-get install -y libatlas3-base libatlas-base-dev
+RUN apt-get install -y gfortran
+
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 && (cd PolyChordLite && python setup.py --no-mpi install)
 
@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
 && (cd PTMCMCSampler && python setup.py install)
 
+# Install GW packages
+RUN conda install -n ${conda_env} -c conda-forge python-lalsimulation
+RUN pip install ligo-gracedb gwpy ligo.skymap
+
 # Add the ROQ data to the image
 RUN mkdir roq_basis \
     && cd roq_basis \
diff --git a/containers/v3-dockerfile-test-suite-python39 b/containers/v3-dockerfile-test-suite-python39
index 6b64f65e0d139a924d3f951d0c9cb9249f0f9811..abb1d6ae5afed08fc3ba4745e00e0b52b1e16cf8 100644
--- a/containers/v3-dockerfile-test-suite-python39
+++ b/containers/v3-dockerfile-test-suite-python39
@@ -15,31 +15,34 @@ RUN /bin/bash -c "source activate ${conda_env}"
 RUN conda info
 RUN python --version
 
-# Install pymultinest requirements
-RUN apt-get update --allow-releaseinfo-change
-RUN apt-get install -y libblas3 libblas-dev liblapack3 liblapack-dev \
-libatlas3-base libatlas-base-dev cmake build-essential gfortran
-
 # Install conda-installable programs
 RUN conda install -n ${conda_env} -y matplotlib numpy scipy pandas astropy flake8 mock
 RUN conda install -n ${conda_env} -c anaconda coverage configargparse future
-
-# Install conda-forge-installable programs
-RUN conda install -n ${conda_env} -c conda-forge black ligo-gracedb gwpy lalsuite ligo.skymap pytest-cov deepdish arviz
+RUN conda install -n ${conda_env} -c conda-forge black pytest-cov deepdish arviz
 
 # Install pip-requirements
 RUN pip install --upgrade pip
-RUN pip install --upgrade setuptools coverage-badge
+RUN pip install --upgrade setuptools coverage-badge parameterized
 
 # Install documentation requirements
 RUN pip install sphinx numpydoc nbsphinx sphinx_rtd_theme sphinx-tabs autodoc
 
 # Install dependencies and samplers
-RUN pip install corner lalsuite theano healpy cython tables
-RUN pip install cpnest dynesty emcee nestle ptemcee pymc3 kombine dnest4 nessai zeus-mcmc
+RUN pip install corner theano healpy cython tables
+RUN conda install -n ${conda_env} -c conda-forge dynesty emcee nestle ptemcee
 RUN conda install -n ${conda_env} -c conda-forge pymultinest ultranest
+RUN conda install -n ${conda_env} -c conda-forge cpnest pymc3 kombine dnest4 zeus-mcmc
+RUN conda install -n ${conda_env} -c conda-forge pytorch
+RUN pip install nessai
 
 # Install Polychord
+RUN apt-get update --allow-releaseinfo-change
+RUN apt-get install -y build-essential
+RUN apt-get install -y libblas3 libblas-dev
+RUN apt-get install -y liblapack3 liblapack-dev
+RUN apt-get install -y libatlas3-base libatlas-base-dev
+RUN apt-get install -y gfortran
+
 RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 && (cd PolyChordLite && python setup.py --no-mpi install)
 
@@ -47,6 +50,10 @@ RUN git clone https://github.com/PolyChord/PolyChordLite.git \
 RUN git clone https://github.com/jellis18/PTMCMCSampler.git \
 && (cd PTMCMCSampler && python setup.py install)
 
+# Install GW packages
+RUN conda install -n ${conda_env} -c conda-forge python-lalsimulation
+RUN pip install ligo-gracedb gwpy ligo.skymap
+
 # Add the ROQ data to the image
 RUN mkdir roq_basis \
     && cd roq_basis \