diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ee73c06..4e9f1d7 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -29,6 +29,7 @@ jobs:
     timeout-minutes: 120
     name: build_linux / ${{ matrix.image.slug }}
     runs-on: "ubuntu-24.04${{ matrix.image.build_on }}"
+    if: false # DROPME. TODO: Delete this line
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8b568c5..c4d8690 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -38,10 +38,10 @@ jobs:
           - package
         arch:
           - x86_64
-          - i686
+          # - i686 # DROPME. TODO: Uncomment this line.
         windows-version:
-          - '2022'
-          # - '2025'
+          # - '2022' # DROPME. TODO: Uncomment this line.
+          - '2025'
     steps:
       - uses: actions/checkout@v6
         with:
diff --git a/windows/package-i686/Dockerfile.2025 b/windows/package-i686/Dockerfile.2025
new file mode 100644
index 0000000..2f0117b
--- /dev/null
+++ b/windows/package-i686/Dockerfile.2025
@@ -0,0 +1,81 @@
+# SPDX-License-Identifier: MIT
+
+# See "Full Tag Listing" in https://hub.docker.com/_/microsoft-windows-servercore
+ARG WIN_VERSION=ltsc2025
+FROM mcr.microsoft.com/windows/servercore:$WIN_VERSION AS MSYS2_download
+
+# We always download x86_64 MSYS2 installer, since our system itself is x86_64.
+ARG MSYS2_VERSION=20240507
+ARG MSYS2_DOWNLOAD_URL=https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-${MSYS2_VERSION}.sfx.exe
+RUN setx /M PATH "C:\msys64\mingw32\bin;C:\msys64\usr\bin;%PATH%" && \
+    powershell -Command "Invoke-WebRequest -Uri %MSYS2_DOWNLOAD_URL% -OutFile C:\windows\temp\msys2-base.sfx.exe"  && \
+    C:\windows\temp\msys2-base.sfx.exe x -o"C:"
+# NOTE: workaround for "gpg: error reading key: Connection timed out"
+RUN bash -l -c "exit 0"
+RUN bash -l -c "pacman -Syuu --noconfirm --noprogressbar"  && \
+    bash -l -c "pacman -Syu --needed --noconfirm --noprogressbar"  && \
+    bash -l -c "pacman -Syu --needed --noconfirm --noprogressbar"  && \
+    bash -l -c " \
+        pacman -S --needed --noconfirm --noprogressbar \
+            mingw-w64-i686-cmake diffutils git m4 make patch tar p7zip mingw-w64-i686-7zip curl python3 \
+        "  && \
+    bash -l -c "git config --system core.longpaths true" && \
+    bash -l -c "pacman -Scc --noconfirm"  && \
+    echo ---- [%date% %time%] Pkg install done!
+# NOTE: If you hang here >10 min. You may want to `zap` temp files.
+#   ref: https://github.com/msys2/MSYS2-packages/issues/2305#issuecomment-758162640
+
+# Because we need an SJLJ toolchain on win32, we manually download one and unpack it into `C:\msys64`:
+ARG GCC_DOWNLOAD_URL=https://github.com/niXman/mingw-builds-binaries/releases/download/12.2.0-rt_v10-rev0/i686-12.2.0-release-posix-sjlj-rt_v10-rev0.7z
+RUN powershell -Command "Invoke-WebRequest -Uri %GCC_DOWNLOAD_URL% -OutFile C:\windows\temp\gcc.7z" && \
+    cd "C:\msys64" && \
+    bash -l -c "/c/msys64/mingw32/bin/7z -y x -- /c/windows/temp/gcc.7z" && \
+    bash -l -c "cp /mingw32/bin/gcc.exe /mingw32/bin/cc.exe"
+
+# ---- Move to new container, to drop messy build history
+ARG WIN_VERSION=ltsc2025
+FROM mcr.microsoft.com/windows/servercore:$WIN_VERSION
+
+COPY --from=MSYS2_download C:/msys64 C:/msys64
+
+# Install .NET runtime for i686
+ARG DOTNET_URL="https://download.visualstudio.microsoft.com/download/pr/c2083daf-6d33-404f-a7d6-dd3bb012a945/e241d0aff000f63ef8a49c3c7da08087/dotnet-runtime-8.0.8-win-x86.exe"
+ARG DOTNET_EXE="C:/windows/temp/dotnet-runtime.exe"
+RUN powershell -Command "\
+    Invoke-WebRequest -Uri '%DOTNET_URL%' -OutFile '%DOTNET_EXE%' -ErrorAction Stop ; \
+    Start-Process '%DOTNET_EXE%' -Wait -ArgumentList '/install', '/quiet', '/norestart' ; \
+    Remove-Item '%DOTNET_EXE%'"
+
+# Download Windows 11 SDK (10.0.22621.2428) and install only `signtool.exe`
+ARG SDK_URL="https://go.microsoft.com/fwlink/?linkid=2250105"
+ARG SDK_EXE="C:/windows/temp/winsdksetup.exe"
+RUN powershell -Command "\
+        Invoke-WebRequest -Uri '%SDK_URL%' -OutFile '%SDK_EXE%' -ErrorAction Stop ; \
+        Start-Process '%SDK_EXE%' -Wait -ArgumentList '/features OptionId.SigningTools', '/q', '/ceip off', '/norestart' ; \
+        setx /M PATH ('%PATH%;' + (Resolve-Path 'C:/Program Files (x86)/Windows Kits/10/bin/*/x64/')) ; \
+        Remove-Item '%SDK_EXE%'"
+
+# Install Visual C++ redistributables
+RUN powershell -Command "Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.208 -Force; Set-PSRepository -Name PSGallery -InstallationPolicy Trusted; Install-Module -Name VcRedist -SkipPublisherCheck -Force -ErrorAction Stop"
+
+# Install AWS CLI
+RUN msiexec.exe /i "https://awscli.amazonaws.com/AWSCLIV2.msi" /quiet /qn && \
+    setx /M PATH "%PATH%;C:\Program Files\Amazon\AWSCLIV2"
+
+# Install `TrustedSigning` powershell module
+RUN powershell -Command "Install-Module -Name TrustedSigning"
+
+
+# Set default environment variables and setup useful symlinks
+# Note that we add an entry for `buildkite-agent` here despite it not being within
+# the image, because we expect it to be mounted within us in the future.
+RUN setx /M PATH "C:\buildkite-agent\bin;C:\msys64\mingw32\bin;C:\msys64\usr\bin;%PATH%" && \
+    mklink /J  C:\msys64\home\ContainerUser C:\Users\ContainerUser  && \
+    setx /M  HOME C:\msys64\home\ContainerUser
+WORKDIR C:/home/ContainerUser
+
+# Select the mingw64 environment: https://www.msys2.org/docs/environments/
+ENV MSYSTEM=MINGW64
+
+# Default to `bash` for interactive builds
+CMD ["bash"]
diff --git a/windows/package-x86_64/Dockerfile.2025 b/windows/package-x86_64/Dockerfile.2025
new file mode 100644
index 0000000..4e78c06
--- /dev/null
+++ b/windows/package-x86_64/Dockerfile.2025
@@ -0,0 +1,92 @@
+# SPDX-License-Identifier: MIT
+
+# See "Full Tag Listing" in https://hub.docker.com/_/microsoft-windows-servercore
+ARG WIN_VERSION=ltsc2025
+FROM mcr.microsoft.com/windows/servercore:$WIN_VERSION AS MSYS2_download
+
+# We always download x86_64 MSYS2 installer, since our system itself is x86_64.
+ARG MSYS2_VERSION=20240507
+ARG MSYS2_DOWNLOAD_URL=https://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-${MSYS2_VERSION}.sfx.exe
+RUN setx /M PATH "C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%" && \
+    powershell -Command "Invoke-WebRequest -Uri %MSYS2_DOWNLOAD_URL% -OutFile C:/windows/temp/msys2-base.sfx.exe"  && \
+    C:\windows\temp\msys2-base.sfx.exe x -o"C:"
+# NOTE: workaround for "gpg: error reading key: Connection timed out"
+RUN bash -l -c "exit 0"
+
+### BEGIN: Splitting a big RUN into multiple smaller RUNs
+RUN bash -l -c "pacman -Syuu --noconfirm --noprogressbar"
+
+RUN bash -l -c "pacman -Syu --needed --noconfirm --noprogressbar"
+
+RUN bash -l -c "pacman -Syu --needed --noconfirm --noprogressbar"
+
+RUN bash -l -c " \
+        pacman -S --needed --noconfirm --noprogressbar \
+            mingw-w64-x86_64-cmake diffutils git m4 make patch tar p7zip curl python3 openssl gnupg2 \
+            mingw-w64-x86_64-gcc \
+        "
+
+RUN bash -l -c "git config --system core.longpaths true"
+
+RUN bash -l -c "pacman -Scc --noconfirm"  && \
+    echo ---- [%date% %time%] Pkg install done!
+# NOTE: If you hang here >10 min. You may want to `zap` temp files.
+#   ref: https://github.com/msys2/MSYS2-packages/issues/2305#issuecomment-758162640
+### END: Splitting a big RUN into multiple smaller RUNs
+
+
+# ---- Move to new container, to drop messy build history
+ARG WIN_VERSION=ltsc2025
+FROM mcr.microsoft.com/windows/servercore:$WIN_VERSION
+
+COPY --from=MSYS2_download C:/msys64 C:/msys64
+
+# Install .NET runtime for x86_64
+ARG DOTNET_URL="https://download.visualstudio.microsoft.com/download/pr/cc913baa-9bce-482e-bdfc-56c4b6fafd10/e3f24f2ab2fc02b395c1b67f5193b8d1/dotnet-runtime-8.0.8-win-x64.exe"
+ARG DOTNET_EXE="C:/windows/temp/dotnet-runtime.exe"
+RUN powershell -Command "\
+    Invoke-WebRequest -Uri '%DOTNET_URL%' -OutFile '%DOTNET_EXE%' -ErrorAction Stop ; \
+    Start-Process '%DOTNET_EXE%' -Wait -ArgumentList '/install', '/quiet', '/norestart' ; \
+    Remove-Item '%DOTNET_EXE%'"
+
+# Install trusted signing dlib
+ARG TS_URL="https://www.nuget.org/api/v2/package/Microsoft.Trusted.Signing.Client/1.0.60"
+ARG TS_ZIP="C:/windows/temp/ts_client.zip"
+ARG TS_DIR="C:/Program Files/TrustedSigning"
+RUN powershell -Command "\
+    Invoke-WebRequest -Uri '%TS_URL%' -OutFile '%TS_ZIP%' -ErrorAction Stop ; \
+    Expand-Archive -Path '%TS_ZIP%' -DestinationPath '%TS_DIR%' -Force ; \
+    Remove-Item '%TS_ZIP%'"
+
+# Download Windows 11 SDK (10.0.22621.2428) and install only `signtool.exe`
+ARG SDK_URL="https://go.microsoft.com/fwlink/?linkid=2250105"
+ARG SDK_EXE="C:/windows/temp/winsdksetup.exe"
+RUN powershell -Command "\
+        Invoke-WebRequest -Uri '%SDK_URL%' -OutFile '%SDK_EXE%' -ErrorAction Stop ; \
+        Start-Process '%SDK_EXE%' -Wait -ArgumentList '/features OptionId.SigningTools', '/q', '/ceip off', '/norestart' ; \
+        setx /M PATH ('%PATH%;' + (Resolve-Path 'C:/Program Files (x86)/Windows Kits/10/bin/*/x64/')) ; \
+        Remove-Item '%SDK_EXE%'"
+
+# Install Visual C++ redistributables
+RUN powershell -Command "Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.208 -Force; Set-PSRepository -Name PSGallery -InstallationPolicy Trusted; Install-Module -Name VcRedist -SkipPublisherCheck -Force -ErrorAction Stop"
+
+# Install AWS CLI
+RUN msiexec.exe /i "https://awscli.amazonaws.com/AWSCLIV2.msi" /quiet /qn && \
+    setx /M PATH "%PATH%;C:\Program Files\Amazon\AWSCLIV2"
+
+# Install `TrustedSigning` powershell module
+RUN powershell -Command "Install-Module -Name TrustedSigning"
+
+# Set default environment variables and setup useful symlinks
+# Note that we add an entry for `buildkite-agent` here despite it not being within
+# the image, because we expect it to be mounted within us in the future.
+RUN setx /M PATH "C:\buildkite-agent\bin;C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%" && \
+    mklink /J C:\msys64\home\ContainerUser C:\Users\ContainerUser && \
+    setx /M HOME C:\msys64\home\ContainerUser
+WORKDIR C:/home/ContainerUser
+
+# Select the mingw64 environment: https://www.msys2.org/docs/environments/
+ENV MSYSTEM=MINGW64
+
+# Default to `bash` for interactive builds
+CMD ["bash"]