diff --git a/.ci/Fedora34/Dockerfile b/.ci/Fedora34/Dockerfile
new file mode 100644
index 00000000..ed2d6581
--- /dev/null
+++ b/.ci/Fedora34/Dockerfile
@@ -0,0 +1,21 @@
+FROM fedora:34
+
+RUN dnf install -y \
+        @development-tools \
+        ccache \
+        cmake \
+        desktop-file-utils \
+        file \
+        gcc-c++ \
+        git \
+        hicolor-icon-theme \
+        libappstream-glib \
+        mariadb-devel \
+        protobuf-devel \
+        qt5-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \
+        rpm-build \
+        sqlite-devel \
+        wget \
+        xz-devel \
+        zlib-devel \
+    && dnf clean all
diff --git a/.ci/UbuntuHirsute/Dockerfile b/.ci/UbuntuHirsute/Dockerfile
new file mode 100644
index 00000000..e6d8998b
--- /dev/null
+++ b/.ci/UbuntuHirsute/Dockerfile
@@ -0,0 +1,24 @@
+FROM ubuntu:hirsute
+
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        build-essential \
+        ccache \
+        clang-format \
+        cmake \
+        file \
+        g++ \
+        git \
+        liblzma-dev \
+        libmariadb-dev-compat \
+        libprotobuf-dev \
+        libqt5multimedia5-plugins \
+        libqt5sql5-mysql \
+        libqt5svg5-dev \
+        libqt5websockets5-dev \
+        protobuf-compiler \
+        qtmultimedia5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/.github/workflows/ci-builds.yml b/.github/workflows/ci-builds.yml
index 9ed4e962..9d7ec95b 100644
--- a/.github/workflows/ci-builds.yml
+++ b/.github/workflows/ci-builds.yml
@@ -82,8 +82,12 @@ jobs:
       matrix:
         # these names correspond to the files in .ci/$distro
         include:
+          - distro: UbuntuHirsute
+            package: DEB
+
           - distro: UbuntuGroovy
             package: DEB
+            test: skip
 
           - distro: UbuntuFocal
             package: DEB
@@ -103,6 +107,10 @@ jobs:
             package: RPM
             test: skip # Fedora is our slowest build
 
+          - distro: Fedora34
+            package: RPM
+            test: skip # gtest does not compile for some reason
+
     name: ${{matrix.distro}}
 
     needs: configure