diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 2c546ef..0836d36 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -40,18 +40,18 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       
-      - name: Build Windows executable via Docker (Robust)
+      - name: Build Windows executable via Docker (Modern)
         run: |
-          # Create a container but don't start it yet
-          docker create --name builder cdrx/pyinstaller-windows sh -c "cd /src && pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py"
+          # Use a modern Python 3.12 image for Windows cross-compilation
+          docker create --name builder --entrypoint /bin/sh tobix/pyinstaller-windows:py312 -c "pip install --upgrade pip && pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py"
           
           # Copy source code into the container
           docker cp . builder:/src
           
-          # Start the container and wait for it to finish
+          # Start the container and wait
           docker start -a builder
           
-          # Copy the results back to the runner
+          # Copy the results back
           docker cp builder:/src/dist .
           
           # Clean up
diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index a2607e5..eb348c3 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -34,9 +34,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Build Windows executable via Docker (Robust)
+      - name: Build Windows executable via Docker (Modern)
         run: |
-          docker create --name release_builder cdrx/pyinstaller-windows sh -c "cd /src && pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py"
+          docker create --name release_builder --entrypoint /bin/sh tobix/pyinstaller-windows:py312 -c "pip install --upgrade pip && pip install -r requirements.txt && pyinstaller --onefile --name tamigo-cli tamigo.py"
           docker cp . release_builder:/src
           docker start -a release_builder
           docker cp release_builder:/src/dist .