diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 27b0da4..b0662f2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,28 +22,28 @@ jobs:
     strategy:
       matrix:
         include:
-        - name: "focal - ompi v5.0.x, chain_lint"
-          image: "focal"
+        - name: "jammy - chain_lint"
+          image: "jammy"
           ompi_branch: "v5.0.0rc12"
           openpmix_branch: "v4.2.3"
           coverage: false
           env:
             chain_lint: t
-        - name: "el8 - ompi v5.0.x, distcheck"
+        - name: "el8 - distcheck"
           image: "el8"
           ompi_branch: "v5.0.0rc12"
           openpmix_branch: "v4.2.3"
           coverage: false
           env:
             DISTCHECK: t
-        - name: "el8 - pmix v3.2.3, ompi v4.1.4"
+        - name: "el8 - ompi v4.1.4"
           image: "el8"
           ompi_branch: "v4.1.4"
           openpmix_branch: "v3.2.3"
           coverage: false
           env: {}
-        - name: "coverage"
-          image: "focal"
+        - name: "jammy - coverage"
+          image: "jammy"
           ompi_branch: "v5.0.0rc12"
           openpmix_branch: "v4.2.3"
           coverage: true
@@ -55,26 +55,26 @@ jobs:
           openpmix_branch: "v4.2.3"
           coverage: false
           env: {}
-        - name: "focal - ompi v4.1.x"
-          image: "focal"
+        - name: "jammy - ompi v4.1.x"
+          image: "jammy"
           ompi_branch: "v4.1.x"
           openpmix_branch: "v4.2.2"
           coverage: false
           env: {}
-        - name: "focal - ompi v4.0.x"
-          image: "focal"
+        - name: "jammy - ompi v4.0.x"
+          image: "jammy"
           ompi_branch: "v4.0.x"
           openpmix_branch: "v4.2.2"
           coverage: false
           env: {}
-        - name: "focal - ompi v3.1.x"
-          image: "focal"
+        - name: "el8 - ompi v3.1.x"
+          image: "el8"
           ompi_branch: "v3.1.x"
           openpmix_branch: "v4.2.2"
           coverage: false
           env: {}
-        - name: "focal - ompi v3.0.x"
-          image: "focal"
+        - name: "el8 - ompi v3.0.x"
+          image: "el8"
           ompi_branch: "v3.0.x"
           openpmix_branch: "v4.2.2"
           coverage: false
diff --git a/src/test/docker/bionic/Dockerfile b/src/test/docker/bionic/Dockerfile
deleted file mode 100644
index 5019fa1..0000000
--- a/src/test/docker/bionic/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM fluxrm/flux-core:bionic
-
-ARG USER=fluxuser
-ARG UID=1000
-ARG OMPI_BRANCH=v5.0.x
-ARG OPENPMIX_BRANCH=v4.2.2
-
-RUN \
- if test "$USER" != "fluxuser"; then  \
-      sudo groupadd -g $UID $USER \
-   && sudo useradd -g $USER -u $UID -d /home/$USER -m $USER \
-   && sudo sh -c "printf \"$USER ALL= NOPASSWD: ALL\\n\" >> /etc/sudoers" \
-   && sudo adduser $USER sudo ; \
- fi
-
-# ompi can't coexist with mpich
-RUN sudo apt remove -yy mpich \
- && sudo apt clean
-
-# install ompi prereqs
-RUN sudo apt-get update \
- && sudo apt-get -qq install -y --no-install-recommends \
-    libevent-dev \
-    flex \
-    openssh-client \
- && sudo apt clean \
- && sudo rm -rf /var/lib/apt/lists/*
-
-# build/install openpmix
-RUN cd /tmp \
- && git clone -b ${OPENPMIX_BRANCH} \
-      --recursive --depth=1 https://github.com/openpmix/openpmix \
- && cd openpmix \
- && git branch \
- && ./autogen.pl \
- && ./configure --prefix=/usr \
-      --enable-debug --disable-sphinx \
- && make -j $(nproc) \
- && sudo make install \
- && cd .. \
- && rm -rf openpmix
-
-# build/install ompi
-RUN cd /tmp \
- && git clone -b ${OMPI_BRANCH} \
-      --recursive --depth=1 https://github.com/open-mpi/ompi \
- && cd ompi \
- && git branch \
- && ./autogen.pl \
- && ./configure --prefix=/usr \
-      --disable-man-pages --enable-debug --enable-mem-debug \
-      --with-pmix=external --with-libevent --disable-sphinx \
- && make -j $(nproc) \
- && sudo make install \
- && cd .. \
- && rm -rf ompi
-
-USER $USER
-WORKDIR /home/$USER
-
diff --git a/src/test/docker/docker-run-checks.sh b/src/test/docker/docker-run-checks.sh
index 21ea108..d31af47 100755
--- a/src/test/docker/docker-run-checks.sh
+++ b/src/test/docker/docker-run-checks.sh
@@ -11,7 +11,7 @@ PROJECT=flux-pmix
 BASE_DOCKER_REPO=fluxrm/flux-core
 
 WORKDIR=/usr/src
-IMAGE=focal
+IMAGE=jammy
 JOBS=2
 MOUNT_HOME_ARGS="--volume=$HOME:/home/$USER -e HOME"
 
diff --git a/src/test/docker/el7/Dockerfile b/src/test/docker/el7/Dockerfile
deleted file mode 100644
index a807ab3..0000000
--- a/src/test/docker/el7/Dockerfile
+++ /dev/null
@@ -1,59 +0,0 @@
-FROM fluxrm/flux-core:el7
-
-ARG USER=fluxuser
-ARG UID=1000
-ARG OMPI_BRANCH=v5.0.x
-ARG OPENPMIX_BRANCH=v4.2.2
-
-RUN \
- if test "$USER" != "fluxuser"; then  \
-      sudo groupadd -g $UID $USER \
-   && sudo useradd -g $USER -u $UID -d /home/$USER -m $USER \
-   && sudo sh -c "printf \"$USER ALL= NOPASSWD: ALL\\n\" >> /etc/sudoers" \
-   && sudo usermod -G wheel $USER \
-   && sudo usermod -G wheel fluxuser ; \
- fi
-
-# ompi incompatible with mpich
-RUN sudo yum -y remove mpich mpich-devel
-
-# install ompi prereqs
-RUN sudo yum -y update \
- && sudo yum -y install \
-    flex \
-    libevent-devel \
-    zlib-devel \
- && sudo yum clean all
-
- # build/install openpmix
-RUN cd /tmp \
- && git clone -b ${OPENPMIX_BRANCH} \
-      --recursive --depth=1 https://github.com/openpmix/openpmix \
- && cd openpmix \
- && git branch \
- && ./autogen.pl \
- && ./configure --prefix=/usr \
-      --enable-debug --disable-sphinx \
- && make -j $(nproc) \
- && sudo make install \
- && cd .. \
- && rm -rf openpmix
-
-# build/install ompi
-RUN cd /tmp \
- && git clone -b ${OMPI_BRANCH} \
-      --recursive --depth=1 https://github.com/open-mpi/ompi \
- && cd ompi \
- && git branch \
- && ./autogen.pl \
- && ./configure --prefix=/usr \
-      --disable-man-pages --enable-debug --enable-mem-debug \
-      --with-pmix=external --with-libevent --disable-sphinx \
- && make -j $(nproc) \
- && sudo make install \
- && cd .. \
- && rm -rf ompi
-
-USER $USER
-WORKDIR /home/$USER
-
diff --git a/src/test/docker/focal/Dockerfile b/src/test/docker/jammy/Dockerfile
similarity index 88%
rename from src/test/docker/focal/Dockerfile
rename to src/test/docker/jammy/Dockerfile
index 4b7e92f..4f0b0f3 100644
--- a/src/test/docker/focal/Dockerfile
+++ b/src/test/docker/jammy/Dockerfile
@@ -1,9 +1,9 @@
-FROM fluxrm/flux-core:focal
+FROM fluxrm/flux-core:jammy
 
 ARG USER=fluxuser
 ARG UID=1000
 ARG OMPI_BRANCH=v5.0.x
-ARG OPENPMIX_BRANCH=v4.2.2
+ARG OPENPMIX_BRANCH=v4.2.4
 
 RUN \
  if test "$USER" != "fluxuser"; then  \
@@ -13,11 +13,13 @@ RUN \
    && sudo adduser $USER sudo ; \
  fi
 
-# remove installed mpich / openmpi / pmix
+# remove installed mpich
 RUN sudo apt purge -yy mpich libmpich-dev \
- openmpi-bin openmpi-common libopenmpi-dev libopenmpi3 libpmix2 \
  && sudo apt clean
 
+# remove mca dir from hand-installed openpmix which will be overwritten below
+RUN sudo rm -rf /usr/lib/pmix
+
 # install ompi prereqs
 RUN sudo apt-get update \
  && sudo apt-get -qq install -y --no-install-recommends \