diff --git a/.github/workflows/ci.mingw.yml b/.github/workflows/ci.mingw.yml
index 2dee7493..846d2a89 100644
--- a/.github/workflows/ci.mingw.yml
+++ b/.github/workflows/ci.mingw.yml
@@ -41,7 +41,7 @@ jobs:
             ${{ env.XDG_CACHE_HOME }}/vcpkg/archives
             ${{ env.LOCALAPPDATA }}\vcpkg\archives
             ${{ env.APPDATA }}\vcpkg\archives
-          key: ${{ runner.os }}-mingw-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}}-${{ matrix.cmake }}
+          key: ${{ runner.os }}-mingw-${{ matrix.platform }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}}-${{ matrix.cmake }}
           restore-keys: |
             ${{ runner.os }}-${{ env.BUILD_TYPE }}-
 
@@ -61,7 +61,7 @@ jobs:
       - name: Setup MinGW
         uses: egor-tensin/setup-mingw@v2
         with:
-          platform: ${{ matrix.cmake }}
+          platform: ${{ matrix.platform }}
 
       - name: Build (Minimal)
         run: |
diff --git a/docker-compose.yml b/docker-compose.yml
index e038e50e..623cbb7d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -70,4 +70,12 @@ services:
     build:
       context: .
       dockerfile: ./docker/Dockerfile.mingw
-      target: build-minimal-from-triplet
\ No newline at end of file
+      target: build-minimal-from-triplet
+  minimal-build-mingw-x86:
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile.mingw
+      target: build-minimal
+    environment:
+      - CROSS_CC=i686-w64-mingw32-gcc
+      - CROSS_CXX=i686-w64-mingw32-g++
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 4690d053..a8dd7dfe 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,8 @@
 FROM ubuntu:22.04 AS base
 
-ARG setup_cpp_linux_version="0.24.0"
+ARG setup_cpp_linux_version="0.24.1"
 
-# add setup_cpp
+# add setup_cpp https://github.com/aminya/setup-cpp
 ADD https://github.com/aminya/setup-cpp/releases/download/v${setup_cpp_linux_version}/setup_cpp_linux /setup_cpp_linux
 RUN chmod +x /setup_cpp_linux
 
@@ -11,7 +11,7 @@ FROM base AS setup
 
 ARG compiler="gcc"
 # install cmake, ninja, and ccache
-RUN /setup_cpp_linux --compiler $compiler --llvm true --cmake true --ninja true --ccache true --cppcheck true --vcpkg true --conan true --task true
+RUN /setup_cpp_linux --compiler $compiler --llvm true --cmake true --doxygen true --ninja true --ccache true --cppcheck true --vcpkg true --conan true --task true
 
 
 COPY ./docker/entrypoint.sh /docker-entrypoint.sh
@@ -21,11 +21,11 @@ ENTRYPOINT [ "/docker-entrypoint.sh" ]
 FROM setup AS build
 COPY . /home/project_options
 WORKDIR /home/project_options
-CMD ["/bin/bash", "-c", "task minimal:build"]
+CMD ["/bin/bash", "-c", "task myproj:build"]
 
 
 FROM setup AS test
 COPY . /home/project_options
 WORKDIR /home/project_options
-CMD ["/bin/bash", "-c", "task main:test"]
+CMD ["/bin/bash", "-c", "task myproj:test"]
 
diff --git a/docker/Dockerfile.emscripten b/docker/Dockerfile.emscripten
index 578c6c40..27f19412 100644
--- a/docker/Dockerfile.emscripten
+++ b/docker/Dockerfile.emscripten
@@ -1,8 +1,8 @@
 FROM ubuntu:22.04 AS base
 
-ARG setup_cpp_linux_version="0.24.0"
+ARG setup_cpp_linux_version="0.24.1"
 
-# add setup_cpp
+# add setup_cpp https://github.com/aminya/setup-cpp
 ADD https://github.com/aminya/setup-cpp/releases/download/v${setup_cpp_linux_version}/setup_cpp_linux /setup_cpp_linux
 RUN chmod +x /setup_cpp_linux
 
diff --git a/docker/Dockerfile.mingw b/docker/Dockerfile.mingw
index 263a13fd..f3c91859 100644
--- a/docker/Dockerfile.mingw
+++ b/docker/Dockerfile.mingw
@@ -1,8 +1,8 @@
 FROM ubuntu:22.04 AS base
 
-ARG setup_cpp_linux_version="0.24.0"
+ARG setup_cpp_linux_version="0.24.1"
 
-# add setup_cpp
+# add setup_cpp https://github.com/aminya/setup-cpp
 ADD https://github.com/aminya/setup-cpp/releases/download/v${setup_cpp_linux_version}/setup_cpp_linux /setup_cpp_linux
 RUN chmod +x /setup_cpp_linux
 
@@ -26,22 +26,22 @@ ENTRYPOINT [ "/docker-entrypoint.sh" ]
 FROM setup AS build
 COPY . /home/project_options
 WORKDIR /home/project_options
-CMD ["/bin/bash", "-c", "task main:build:mingw"]
+CMD ["/bin/bash", "-c", "task myproj:build.mingw"]
 
 
 FROM setup AS build-minimal
 COPY . /home/project_options
 WORKDIR /home/project_options
-CMD ["/bin/bash", "-c", "task minimal:build:mingw"]
+CMD ["/bin/bash", "-c", "task minimal:build.mingw"]
 
 
 FROM setup AS build-minimal-from-env
 COPY . /home/project_options
 WORKDIR /home/project_options
-CMD ["/bin/bash", "-c", "task minimal:build:mingw:from-env"]
+CMD ["/bin/bash", "-c", "task minimal:build.mingw.from-env"]
 
 
 FROM setup AS build-minimal-from-triplet
 COPY . /home/project_options
 WORKDIR /home/project_options
-CMD ["/bin/bash", "-c", "task minimal:build:mingw:from-triplet"]
+CMD ["/bin/bash", "-c", "task minimal:build.mingw.from-triplet"]
diff --git a/docker/Taskfile.yml b/docker/Taskfile.yml
index 78a0f278..19dd8d3d 100644
--- a/docker/Taskfile.yml
+++ b/docker/Taskfile.yml
@@ -4,21 +4,20 @@ tasks:
   gcc:
     - docker-compose up --build build-gcc
     - docker-compose up --build test-gcc
-    - docker-compose down build-gcc test-gcc
+    - docker-compose down
 
   llvm:
     - docker-compose up --build build-llvm
     - docker-compose up --build test-llvm
-    - docker-compose down build-llvm test-llvm
+    - docker-compose down
 
   mingw:
     - docker-compose up --build minimal-build-mingw-x64
     - docker-compose up --build minimal-build-mingw-x64-from-env
     - docker-compose up --build minimal-build-mingw-x64-from-triplet
-    - docker-compose up --build build-mingw-x64
-    - docker-compose up --build build-mingw-x86
-    - docker-compose down minimal-build-mingw-x64 minimal-build-mingw-x64-from-triplet minimal-build-mingw-x64-from-env build-mingw-x64 build-mingw-x86
+    - docker-compose up --build minimal-build-mingw-x86
+    - docker-compose down
     
   emscripten:
     - docker-compose up --build build-emscripten
-    - docker-compose down build-emscripten
\ No newline at end of file
+    - docker-compose down
\ No newline at end of file