diff --git a/.github/workflows/build-zimfile.yml b/.github/workflows/build-zimfile.yml
index f4afb3d88..ff3c2c37a 100644
--- a/.github/workflows/build-zimfile.yml
+++ b/.github/workflows/build-zimfile.yml
@@ -136,10 +136,10 @@ jobs:
           echo "ZIMFILE_NAME=privacyguides.org_en_all_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
 
       - name: Create ZIM File
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimwriterfs \
               -w index.html \
@@ -161,11 +161,11 @@ jobs:
           compression-level: 0
 
       - name: Run zimcheck
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         continue-on-error: true
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimcheck /data/${{ env.ZIMFILE_NAME }}
 
@@ -265,11 +265,15 @@ jobs:
         run: |
           echo "ZIMFILE_NAME=privacyguides.org_en_kb_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
 
+      - name: List Files (for debugging)
+        run: |
+          ls -la site/
+
       - name: Create ZIM File
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimwriterfs \
               -w index.html \
@@ -291,11 +295,11 @@ jobs:
           compression-level: 0
 
       - name: Run zimcheck
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         continue-on-error: true
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimcheck /data/${{ env.ZIMFILE_NAME }}
 
@@ -372,10 +376,10 @@ jobs:
           echo "ZIMFILE_NAME=privacyguides.org_en_articles_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
 
       - name: Create ZIM File
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimwriterfs \
               -w index.html \
@@ -397,11 +401,11 @@ jobs:
           compression-level: 0
 
       - name: Run zimcheck
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         continue-on-error: true
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimcheck /data/${{ env.ZIMFILE_NAME }}
 
@@ -551,10 +555,9 @@ jobs:
           pattern: site-zimready-*
           merge-multiple: true
 
-      - name: List Files (for debugging)
+      - name: Extract Sites
         run: |
           for file in *.tar.gz; do tar -zxf "$file"; done
-          ls -la site/
 
       - name: Remove Duplicate Files
         run: |
@@ -567,11 +570,15 @@ jobs:
         run: |
           echo "ZIMFILE_NAME=privacyguides.org_mul_all_$(date +%Y)-$(date +%m).zim" >> "$GITHUB_ENV"
 
+      - name: List Files (for debugging)
+        run: |
+          ls -la site/
+
       - name: Create ZIM File
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimwriterfs \
               -w index.html \
@@ -593,10 +600,10 @@ jobs:
           compression-level: 0
 
       - name: Run zimcheck
-        uses: addnab/docker-run-action@v3
+        uses: kohlerdominik/docker-run-action@44bd2138ca4f85c36b2fdc3966ef03518879f7f3
         continue-on-error: true
         with:
-          image: ghcr.io/openzim/zim-tools:3.1.3
-          options: -v ${{ github.workspace }}:/data
+          image: ghcr.io/openzim/zim-tools:3.6.0
+          volumes: ${{ github.workspace }}:/data
           run: |
             zimcheck /data/${{ env.ZIMFILE_NAME }}