diff --git a/ci/alpine/Dockerfile b/ci/alpine/Dockerfile
index 83c3b44e9f..72cacecd66 100644
--- a/ci/alpine/Dockerfile
+++ b/ci/alpine/Dockerfile
@@ -5,25 +5,25 @@ FROM alpine:latest
 ENV DOCKERFILE_VERSION 20220519
 
 RUN apk add --no-cache \
+  bash \
+  bison \
+  bsd-compat-headers \
   ccache \
   cmake \
-  make \
+  curl \
+  flex-dev \
+  fts-dev \
   g++ \
+  git \
+  libpcap-dev \
+  linux-headers \
+  make \
+  openssh-client \
+  openssl-dev \
+  py3-pip \
   python3 \
   python3-dev \
-  flex-dev \
-  bison \
-  libpcap-dev \
-  openssl-dev \
-  zlib-dev \
   swig \
-  bash \
-  bsd-compat-headers \
-  linux-headers \
-  fts-dev \
-  git \
-  curl \
-  openssh-client \
-  py3-pip
+  zlib-dev
 
 RUN pip3 install websockets junit2html
diff --git a/ci/centos-7/Dockerfile b/ci/centos-7/Dockerfile
index bb1ea3ca87..67de595c80 100644
--- a/ci/centos-7/Dockerfile
+++ b/ci/centos-7/Dockerfile
@@ -31,21 +31,21 @@ RUN yum -y install \
   && yum clean all && rm -rf /var/cache/yum
 
 RUN yum -y install \
+    bison \
     cmake3 \
     curl \
+    findutils \
+    libpcap-devel \
     make \
-    bison \
-    swig \
     openssl \
     openssl-devel \
-    libpcap-devel \
     python3 \
     python3-devel \
     python3-pip\
-    zlib-devel \
     sqlite \
-    findutils \
+    swig \
     which \
+    zlib-devel \
   && yum clean all && rm -rf /var/cache/yum
 
 # Install a recent flex for Spicy.
diff --git a/ci/centos-stream-9/Dockerfile b/ci/centos-stream-9/Dockerfile
index 57e23f54cc..4ba33dd568 100644
--- a/ci/centos-stream-9/Dockerfile
+++ b/ci/centos-stream-9/Dockerfile
@@ -36,9 +36,9 @@ RUN dnf -y --nobest install \
     python3-pip\
     sqlite \
     swig \
+    tar \
     which \
     zlib-devel \
-    tar \
   && dnf clean all && rm -rf /var/cache/dnf
 
 # Set the crypto policy to allow SHA-1 certificates - which we have in our tests
diff --git a/ci/debian-10/Dockerfile b/ci/debian-10/Dockerfile
index c655f6f031..077e2bc7d8 100644
--- a/ci/debian-10/Dockerfile
+++ b/ci/debian-10/Dockerfile
@@ -11,26 +11,26 @@ ENV CMAKE_VERSION "3.19.1"
 ENV PATH "${CMAKE_DIR}/bin:${PATH}"
 
 RUN apt-get update && apt-get -y install \
-    git \
-    make \
-    gcc \
-    g++ \
-    flex \
     bison \
+    bsdmainutils \
+    ccache \
+    curl \
+    flex \
+    g++ \
+    gcc \
+    git \
+    libkrb5-dev \
     libpcap-dev \
     libssl-dev \
+    make \
     python3 \
     python3-dev \
     python3-pip\
-    swig \
-    zlib1g-dev \
-    libkrb5-dev \
-    bsdmainutils \
     sqlite3 \
-    curl \
+    swig \
     wget \
     xz-utils \
-    ccache \
+    zlib1g-dev \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/ci/debian-11/Dockerfile b/ci/debian-11/Dockerfile
index 15f66e8e2c..8795d2bd45 100644
--- a/ci/debian-11/Dockerfile
+++ b/ci/debian-11/Dockerfile
@@ -7,27 +7,27 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 ENV DOCKERFILE_VERSION 20220519
 
 RUN apt-get update && apt-get -y install \
-    ccache \
-    git \
-    cmake \
-    make \
-    gcc \
-    g++ \
-    flex \
     bison \
+    bsdmainutils \
+    ccache \
+    cmake \
+    curl \
+    flex \
+    g++ \
+    gcc \
+    git \
+    libkrb5-dev \
     libpcap-dev \
     libssl-dev \
+    make \
     python3 \
     python3-dev \
     python3-pip\
-    swig \
-    zlib1g-dev \
-    libkrb5-dev \
-    bsdmainutils \
     sqlite3 \
-    curl \
+    swig \
     wget \
     xz-utils \
+    zlib1g-dev \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/ci/debian-9-32bit/Dockerfile b/ci/debian-9-32bit/Dockerfile
index 7b0a177e14..5602dbaf41 100644
--- a/ci/debian-9-32bit/Dockerfile
+++ b/ci/debian-9-32bit/Dockerfile
@@ -11,27 +11,27 @@ ENV CMAKE_VERSION "3.19.1"
 ENV PATH "${CMAKE_DIR}/bin:${PATH}"
 
 RUN apt-get update && apt-get -y install \
-    ccache \
-    git \
-    clang-11 \
-    make \
-    flex \
     bison \
+    bsdmainutils \
+    ccache \
+    clang-11 \
+    curl \
+    flex \
+    git \
     libc++-11-dev \
     libc++abi-11-dev \
+    libkrb5-dev \
     libpcap-dev \
     libssl-dev \
+    make \
     python3 \
     python3-dev \
     python3-pip\
-    swig \
-    zlib1g-dev \
-    libkrb5-dev \
-    bsdmainutils \
     sqlite3 \
-    curl \
+    swig \
     wget \
     xz-utils \
+    zlib1g-dev \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/ci/debian-9/Dockerfile b/ci/debian-9/Dockerfile
index b4aa291e9b..dea6e7ead3 100644
--- a/ci/debian-9/Dockerfile
+++ b/ci/debian-9/Dockerfile
@@ -11,27 +11,27 @@ ENV CMAKE_VERSION "3.19.1"
 ENV PATH "${CMAKE_DIR}/bin:${PATH}"
 
 RUN apt-get update && apt-get -y install \
-    ccache \
-    git \
-    clang-11 \
-    make \
-    flex \
     bison \
+    bsdmainutils \
+    ccache \
+    clang-11 \
+    curl \
+    flex \
+    git \
     libc++-11-dev \
     libc++abi-11-dev \
+    libkrb5-dev \
     libpcap-dev \
     libssl-dev \
+    make \
     python3 \
     python3-dev \
     python3-pip\
-    swig \
-    zlib1g-dev \
-    libkrb5-dev \
-    bsdmainutils \
     sqlite3 \
-    curl \
+    swig \
     wget \
     xz-utils \
+    zlib1g-dev \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/ci/fedora-34/Dockerfile b/ci/fedora-34/Dockerfile
index 616c121092..aaee737b97 100644
--- a/ci/fedora-34/Dockerfile
+++ b/ci/fedora-34/Dockerfile
@@ -5,8 +5,8 @@ FROM fedora:34
 ENV DOCKERFILE_VERSION 20220519
 
 RUN dnf -y install \
-    ccache \
     bison \
+    ccache \
     cmake \
     diffutils \
     findutils \
diff --git a/ci/fedora-35/Dockerfile b/ci/fedora-35/Dockerfile
index 202d002aab..a6d138563e 100644
--- a/ci/fedora-35/Dockerfile
+++ b/ci/fedora-35/Dockerfile
@@ -5,8 +5,8 @@ FROM fedora:35
 ENV DOCKERFILE_VERSION 20220519
 
 RUN dnf -y install \
-    ccache \
     bison \
+    ccache \
     cmake \
     diffutils \
     findutils \
diff --git a/ci/openssl-3.0/Dockerfile b/ci/openssl-3.0/Dockerfile
index 69ad47a8bf..e31f14a92e 100644
--- a/ci/openssl-3.0/Dockerfile
+++ b/ci/openssl-3.0/Dockerfile
@@ -7,31 +7,31 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 ENV DOCKERFILE_VERSION 20220519
 
 RUN apt-get update && apt-get -y install \
-    ccache \
-    git \
-    cmake \
-    make \
-    gcc \
-    g++ \
-    flex \
+    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\
-    swig \
-    zlib1g-dev \
-    libmaxminddb-dev \
-    libkrb5-dev \
-    bsdmainutils \
-    sqlite3 \
-    curl \
-    wget \
-    unzip \
     ruby \
-    bc \
-    lcov \
+    sqlite3 \
+    swig \
+    unzip \
+    wget \
+    zlib1g-dev \
   && rm -rf /var/lib/apt/lists/*
 
 # Note - the symlink is important, otherwise cmake uses the wrong .so files.
diff --git a/ci/opensuse-leap-15.3/Dockerfile b/ci/opensuse-leap-15.3/Dockerfile
index 68a6a0b64a..c9f29b5635 100644
--- a/ci/opensuse-leap-15.3/Dockerfile
+++ b/ci/opensuse-leap-15.3/Dockerfile
@@ -7,25 +7,25 @@ ENV DOCKERFILE_VERSION 20220519
 RUN zypper addrepo https://download.opensuse.org/repositories/openSUSE:Leap:15.2:Update/standard/openSUSE:Leap:15.2:Update.repo \
  && zypper refresh \
  && zypper in -y \
-  ccache \
-  cmake \
-  make \
-  gcc9 \
-  gcc9-c++ \
-  python3 \
-  python3-devel \
-  flex \
-  bison \
-  libpcap-devel \
-  libopenssl-devel \
-  zlib-devel \
-  swig \
-  git \
-  curl \
-  python3-pip \
-  which \
-  gzip \
-  tar \
+    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
diff --git a/ci/ubuntu-18.04/Dockerfile b/ci/ubuntu-18.04/Dockerfile
index 8aefc632d6..6d6d299caf 100644
--- a/ci/ubuntu-18.04/Dockerfile
+++ b/ci/ubuntu-18.04/Dockerfile
@@ -11,29 +11,29 @@ ENV CMAKE_VERSION "3.19.1"
 ENV PATH "${CMAKE_DIR}/bin:${PATH}"
 
 RUN apt-get update && apt-get -y install \
-    git \
-    clang-10 \
-    make \
-    flex \
+    bc \
     bison \
+    bsdmainutils \
+    ccache \
+    clang-10 \
+    curl \
+    flex \
+    git \
+    lcov \
+    libkrb5-dev \
+    libmaxminddb-dev \
     libpcap-dev \
     libssl-dev \
+    make \
     python3 \
     python3-dev \
     python3-pip\
-    swig \
-    zlib1g-dev \
-    libmaxminddb-dev \
-    libkrb5-dev \
-    bsdmainutils \
-    sqlite3 \
-    curl \
-    wget \
-    unzip \
     ruby \
-    bc \
-    lcov \
-    ccache \
+    sqlite3 \
+    swig \
+    unzip \
+    wget \
+    zlib1g-dev \
   && apt-get autoclean \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/ci/ubuntu-20.04/Dockerfile b/ci/ubuntu-20.04/Dockerfile
index 7619c8c093..54ad8a4133 100644
--- a/ci/ubuntu-20.04/Dockerfile
+++ b/ci/ubuntu-20.04/Dockerfile
@@ -7,31 +7,31 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 ENV DOCKERFILE_VERSION 20220519
 
 RUN apt-get update && apt-get -y install \
-    ccache \
-    git \
-    cmake \
-    make \
-    gcc \
-    g++ \
-    flex \
+    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\
-    swig \
-    zlib1g-dev \
-    libmaxminddb-dev \
-    libkrb5-dev \
-    bsdmainutils \
-    sqlite3 \
-    curl \
-    wget \
-    unzip \
     ruby \
-    bc \
-    lcov \
+    sqlite3 \
+    swig \
+    unzip \
+    wget \
+    zlib1g-dev \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/ci/ubuntu-21.10/Dockerfile b/ci/ubuntu-21.10/Dockerfile
index b106ccd9f4..011610fbe4 100644
--- a/ci/ubuntu-21.10/Dockerfile
+++ b/ci/ubuntu-21.10/Dockerfile
@@ -7,31 +7,31 @@ ENV DEBIAN_FRONTEND="noninteractive" TZ="America/Los_Angeles"
 ENV DOCKERFILE_VERSION 20220519
 
 RUN apt-get update && apt-get -y install \
-    git \
+    bc \
+    bison \
+    bsdmainutils \
     ccache \
     cmake \
-    make \
-    gcc \
-    g++ \
+    curl \
     flex \
-    bison \
+    g++ \
+    gcc \
+    git \
+    lcov \
+    libkrb5-dev \
+    libmaxminddb-dev \
     libpcap-dev \
     libssl-dev \
+    make \
     python3 \
     python3-dev \
     python3-pip\
-    swig \
-    zlib1g-dev \
-    libmaxminddb-dev \
-    libkrb5-dev \
-    bsdmainutils \
-    sqlite3 \
-    curl \
-    wget \
-    unzip \
     ruby \
-    bc \
-    lcov \
+    sqlite3 \
+    swig \
+    unzip \
+    wget \
+    zlib1g-dev \
   && apt autoclean \
   && rm -rf /var/lib/apt/lists/*