diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 45a6067..85b7729 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         # Remember if you commit this, newly built images will replace those tags.
         # Prefer incrementing the version to unused one
-        tag: [6-bionic32, 6-mingw32, 6-focal32, 6-jammy32]
+        tag: [7-mingw32, 7-jammy32, 7-mantic32]
     env:
       dockertag: ${{ matrix.tag }}
       REGISTRY: ghcr.io
diff --git a/7/jammy32/Dockerfile b/7/jammy32/Dockerfile
new file mode 100644
index 0000000..00a1ff5
--- /dev/null
+++ b/7/jammy32/Dockerfile
@@ -0,0 +1,22 @@
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN dpkg --add-architecture i386 \
+    && apt-get update \
+    && apt-get -y upgrade \
+    && apt-get install --no-install-recommends -y \
+        ca-certificates \
+        ccache \
+        clang \
+        cmake \
+        g++-multilib \
+        gcc-multilib \
+        git \
+        libgtest-dev:i386 \
+        libopenal-dev:i386 \
+        libpng-dev:i386 \
+        libsdl2-dev:i386 \
+        ninja-build \
+        pkg-config:i386 \
+    && update-ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/7/mantic32/Dockerfile b/7/mantic32/Dockerfile
new file mode 100644
index 0000000..b6bf4c9
--- /dev/null
+++ b/7/mantic32/Dockerfile
@@ -0,0 +1,22 @@
+FROM ubuntu:23.10
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN dpkg --add-architecture i386 \
+    && apt-get update \
+    && apt-get -y upgrade \
+    && apt-get install --no-install-recommends -y \
+        ca-certificates \
+        ccache \
+        clang \
+        cmake \
+        g++-multilib \
+        gcc-multilib \
+        git \
+        libgtest-dev:i386 \
+        libopenal-dev:i386 \
+        libpng-dev:i386 \
+        libsdl2-dev:i386 \
+        ninja-build \
+        pkg-config:i386 \
+    && update-ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
diff --git a/7/mingw32/Dockerfile b/7/mingw32/Dockerfile
new file mode 100644
index 0000000..678a7bd
--- /dev/null
+++ b/7/mingw32/Dockerfile
@@ -0,0 +1,4 @@
+FROM fedora:39
+RUN dnf update -y && \
+  dnf install -y mingw32-gcc-c++ mingw32-SDL2 mingw32-SDL2-static ccache cmake git ninja-build dnf-plugins-core mingw32-yaml-cpp mingw32-libpng mingw32-openal-soft && \
+  dnf clean all --enablerepo=\*