diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5bad4003..d260ac56 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -37,7 +37,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./docker/rayleigh/
-          cache-from: type=registry,ref=geodynamics/rayleigh-buildenv-bionic
+          cache-from: type=registry,ref=geodynamics/rayleigh-buildenv-jammy
           cache-to: type=inline
           push: true
           tags: geodynamics/rayleigh:latest
@@ -47,7 +47,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: ./docker/rayleigh/
-          cache-from: type=registry,ref=geodynamics/rayleigh-buildenv-bionic
+          cache-from: type=registry,ref=geodynamics/rayleigh-buildenv-jammy
           cache-to: type=inline
           push: true
           tags: geodynamics/rayleigh:${{github.ref_name}}
diff --git a/doc/source/User_Guide/getting_started.rst b/doc/source/User_Guide/getting_started.rst
index 825dceed..6f9fda64 100644
--- a/doc/source/User_Guide/getting_started.rst
+++ b/doc/source/User_Guide/getting_started.rst
@@ -126,7 +126,7 @@ You can download our pre-built container from Docker Hub and launch it using the
 
    ./docker-devel
    # This runs the following command:
-   # docker run -it --rm -v $HOME:/work -e HOSTUID=$UID -e HOSTGID=$GROUPS -e HOSTUSER=$USER geodynamics/rayleigh-devel-bionic:latest
+   # docker run -it --rm -v $HOME:/work -e HOSTUID=$UID -e HOSTGID=$GROUPS -e HOSTUSER=$USER geodynamics/rayleigh-devel-jammy:latest
 
 This will give you a shell inside the container and mount your home directory at ``/work``. You can clone, configure, build, and run the code and analyze the outputs using Python inside the container. Any changes below ``/work`` will be reflected in your home directory. Any other changes to the container will be deleted once you exit the shell.
 
@@ -159,7 +159,7 @@ On the first launch of the container, your local Docker engine will automaticall
 
 .. code-block:: bash
 
-    docker pull geodynamics/rayleigh-devel-bionic:latest
+    docker pull geodynamics/rayleigh-devel-jammy:latest
 
 Building the container
 ^^^^^^^^^^^^^^^^^^^^^^
@@ -170,7 +170,7 @@ To build the container you have to run this command from your host system (i.e.,
 .. code-block:: bash
 
    cd docker
-   docker build -t geodynamics/rayleigh-devel-bionic:latest rayleigh-devel-bionic
+   docker build -t geodynamics/rayleigh-devel-jammy:latest rayleigh-devel-jammy
 
 You can check the newly built container is there using this command.
 
diff --git a/docker/rayleigh-buildenv-bionic/Dockerfile b/docker/rayleigh-buildenv-bionic/Dockerfile
deleted file mode 100644
index e5c460d7..00000000
--- a/docker/rayleigh-buildenv-bionic/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM ubuntu:bionic
-
-RUN apt update && \
-  DEBIAN_FRONTEND='noninteractive' \
-  DEBCONF_NONINTERACTIVE_SEEN='true' \
-  apt install --yes \
-    g++ \
-    gfortran \
-    git \
-    libblas-dev \
-    libfftw3-dev \
-    liblapack-dev \
-    libopenmpi-dev \
-    make \
-    nano \
-    wget \
-    python-pip \
-    python3-pip \
-    sphinx-common \
-    texlive-base \
-    texlive-generic-extra \
-    texlive-latex-base \
-    texlive-latex-recommended \
-    texlive-latex-extra \
-    lmodern \
-    makedepf90 \
-    latexmk \
-    pandoc \
-    python-numpy \
-    python-scipy \
-    python-funcsigs
-
-RUN pip3 install sphinx==4.0 sphinxcontrib-bibtex==1.0.0 nbstripout traitlets==4.3.3 nbsphinx==0.8.5 jupyter-client ipykernel recommonmark sphinx-book-theme
-RUN pip2 install vtk
-
-# Export compilers
-ENV CC mpicc
-ENV CXX mpicxx
-ENV FC mpifort
diff --git a/docker/rayleigh-buildenv-bionic/README.md b/docker/rayleigh-buildenv-bionic/README.md
deleted file mode 100644
index 77711c36..00000000
--- a/docker/rayleigh-buildenv-bionic/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Build environment for Rayleigh using the Ubuntu Bionic Docker container.
diff --git a/docker/rayleigh-devel-bionic/Dockerfile b/docker/rayleigh-devel-bionic/Dockerfile
deleted file mode 100644
index 04c318d5..00000000
--- a/docker/rayleigh-devel-bionic/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM geodynamics/rayleigh-buildenv-bionic
-
-RUN apt update && \
-  DEBIAN_FRONTEND='noninteractive' \
-  DEBCONF_NONINTERACTIVE_SEEN='true' \
-  apt install --yes \
-    sudo
-
-COPY /entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT /entrypoint.sh
-
-# Export compilers
-ENV CC mpicc
-ENV CXX mpicxx
-ENV FC mpifort
diff --git a/docker/rayleigh-devel-bionic/entrypoint.sh b/docker/rayleigh-devel-bionic/entrypoint.sh
deleted file mode 100755
index 732c320a..00000000
--- a/docker/rayleigh-devel-bionic/entrypoint.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-
-export HOME=/work
-cd "$HOME"
-
-if [ -n "$HOSTGID" -a -n "$HOSTUSER" -a -n "$HOSTUID" ]
-then
-	# only create user if all options are provided
-
-	# This only creates the group if a group with that GID does not already exist.
-	getent group $HOSTGID > /dev/null || groupadd -g $HOSTGID $HOSTUSER
-	useradd -u $HOSTUID -g $HOSTGID -d /work -s /bin/bash $HOSTUSER
-
-	echo "$HOSTUSER ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/nopasswd
-
-	sudo -u $HOSTUSER /bin/bash --rcfile /etc/bash.bashrc -i
-else
-        if [ "${NOUIDWARN}" != 1 ]
-        then
-                echo
-                echo "You are running this container without providing the HOSTUSER, HOSTGID, and HOSTUID"
-                echo "environment variables. This means the container will use the root user and it might create files"
-                echo "owned by root in your home directory if you run this on Docker with Linux as a host system."
-                echo 'Consider running this using the "docker-devel" script from the Rayleigh main directory.'
-                echo
-        fi
-	/bin/bash --rcfile /etc/bash.bashrc -i
-fi