diff --git a/.cirrus.yml b/.cirrus.yml
index 87a4ba8a7f..bcc8539c2b 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -197,18 +197,11 @@ debian10_task:
 
 opensuse_leap_15_4_task:
   container:
-    # Opensuse Leap 15.4 EOL: TBD
+    # Opensuse Leap 15.4 EOL: ~Nov 2023
     dockerfile: ci/opensuse-leap-15.4/Dockerfile
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-opensuse_leap_15_3_task:
-  container:
-    # Opensuse Leap 15.3 EOL: ~Dec 2022
-    dockerfile: ci/opensuse-leap-15.3/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-
 opensuse_tumbleweed_task:
   container:
     # Opensuse Tumbleweed has no EOL
@@ -307,17 +300,6 @@ freebsd12_task:
   << : *CI_TEMPLATE
   << : *FREEBSD_ENVIRONMENT
 
-# This can be removed as soon as the first distribution that we use ships
-# OpenSSL 3.0
-openssl30_task:
-  container:
-    # Tweaked Ubuntu 20.04 EOL: April 2025
-    dockerfile: ci/openssl-3.0/Dockerfile
-    << : *RESOURCES_TEMPLATE
-  << : *CI_TEMPLATE
-  env:
-    ZEEK_CI_CONFIGURE_FLAGS: *OPENSSL30_CONFIG
-
 asan_sanitizer_task:
   container:
     # Just uses a recent/common distro to run memory error/leak checks.
diff --git a/ci/fedora-35/Dockerfile b/ci/fedora-35/Dockerfile
deleted file mode 100644
index 287dcb8578..0000000000
--- a/ci/fedora-35/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM fedora:35
-
-# A version field to invalidate Cirrus's build cache when needed, as suggested in
-# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20220519
-
-RUN dnf -y install \
-    bison \
-    ccache \
-    cmake \
-    diffutils \
-    findutils \
-    flex \
-    gcc \
-    gcc-c++ \
-    git \
-    libpcap-devel \
-    make \
-    openssl \
-    openssl-devel \
-    procps-ng \
-    python3 \
-    python3-devel \
-    python3-pip\
-    sqlite \
-    swig \
-    which \
-    zlib-devel \
-  && dnf clean all && rm -rf /var/cache/dnf
-
-RUN pip3 install websockets junit2html
diff --git a/ci/openssl-3.0/Dockerfile b/ci/openssl-3.0/Dockerfile
deleted file mode 100644
index b5200e200a..0000000000
--- a/ci/openssl-3.0/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM ubuntu:20.04
-
-ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
-
-# A version field to invalidate Cirrus's build cache when needed, as suggested in
-# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20220519
-
-RUN apt-get update && apt-get -y install \
-    bc \
-    bison \
-    bsdmainutils \
-    ccache \
-    cmake \
-    curl \
-    flex \
-    g++ \
-    gcc \
-    git \
-    lcov \
-    libkrb5-dev \
-    libmaxminddb-dev \
-    libpcap-dev \
-    libssl-dev \
-    make \
-    python3 \
-    python3-dev \
-    python3-pip\
-    ruby \
-    sqlite3 \
-    swig \
-    unzip \
-    wget \
-    zlib1g-dev \
-  && rm -rf /var/lib/apt/lists/*
-
-# Note - the symlink is important, otherwise cmake uses the wrong .so files.
-RUN wget https://www.openssl.org/source/openssl-3.0.0.tar.gz && tar xvf ./openssl-3.0.0.tar.gz && cd ./openssl-3.0.0 && ./Configure --prefix=/opt/openssl && make install && cd .. && rm -rf openssl-3.0.0 && ln -sf /opt/openssl/lib64 /opt/openssl/lib
-
-RUN pip3 install websockets junit2html
-RUN gem install coveralls-lcov
diff --git a/ci/opensuse-leap-15.3/Dockerfile b/ci/opensuse-leap-15.3/Dockerfile
deleted file mode 100644
index d97ff83308..0000000000
--- a/ci/opensuse-leap-15.3/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM opensuse/leap:15.3
-
-# A version field to invalidate Cirrus's build cache when needed, as suggested in
-# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
-ENV DOCKERFILE_VERSION 20220615
-
-RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.3:Update/standard/openSUSE:Leap:15.3:Update.repo \
- && zypper refresh \
- && zypper in -y \
-    bison \
-    ccache \
-    cmake \
-    curl \
-    flex \
-    gcc9 \
-    gcc9-c++ \
-    git \
-    gzip \
-    libopenssl-devel \
-    libpcap-devel \
-    make \
-    python3 \
-    python3-devel \
-    python3-pip \
-    swig \
-    tar \
-    which \
-    zlib-devel \
-  && rm -rf /var/cache/zypp
-
-RUN pip3 install websockets junit2html
-
-RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-9 100
-RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-9 100