diff --git a/.github/workflows/package-windows-with-docker.yml b/.github/workflows/package-windows-with-docker.yml
index c26f62d..bd183be 100644
--- a/.github/workflows/package-windows-with-docker.yml
+++ b/.github/workflows/package-windows-with-docker.yml
@@ -10,42 +10,28 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        entry: [ kcc-c2e, kcc-c2p ]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-#      - name: Set up Python
-#        uses: actions/setup-python@v4
-#        with:
-#          python-version: 3.11
-#          cache: 'pip'
-#      - name: Install python dependencies
-#        run: |
-#          python -m pip install --upgrade pip setuptools wheel pyinstaller
-#          pip install -r requirements.txt
-#      - name: build binary
-#        run: |
-#          pyi-makespec -F -i icons\\comic2ebook.ico -n KCC_test -w --noupx kcc.py
+
       - name: Package Application
         uses: JackMcKew/pyinstaller-action-windows@main
         with:
           path: .
-          spec: ./kcc-c2e.spec
-      - name: Package Application
-        uses: JackMcKew/pyinstaller-action-windows@main
-        with:
-          path: .
-          spec: ./kcc-c2p.spec
+          spec: ./${{ matrix.entry }}.spec
       - name: rename binaries
         run: |   
           version_built=$(cat kindlecomicconverter/__init__.py | grep version | awk '{print $3}' | sed "s/[^.0-9b]//g")
-          mv dist/windows/kcc-c2e.exe dist/windows/KCC_c2e_${version_built}.exe 
-          mv dist/windows/kcc-c2p.exe dist/windows/KCC_c2p_${version_built}.exe
+          mv dist/windows/${{ matrix.entry }}.exe dist/windows/${{ matrix.entry }}_${version_built}.exe 
 
       - name: upload-unsigned-artifact
         id: upload-unsigned-artifact
         uses: actions/upload-artifact@v4
         with:
-          name: windows-build
+          name: windows-build-${{ matrix.entry }}
           path: dist/windows/*.exe
       
       - id: optional_step_id