diff --git a/.github/matrix.json b/.github/matrix.json
index 30988ef..09366d4 100644
--- a/.github/matrix.json
+++ b/.github/matrix.json
@@ -5,7 +5,10 @@
         "5.7",
         "5.6"
     ],
-    "mint_revision": [
-        "master"
-    ]
+    "mint_revision": {
+        "5.9": "master",
+        "5.8": "0.17.5",
+        "5.7": "0.17.5",
+        "5.6": "0.17.5"
+    }
 }
\ No newline at end of file
diff --git a/.github/workflows/docker_hub.yml b/.github/workflows/docker_hub.yml
index e75a058..5bc5f4a 100644
--- a/.github/workflows/docker_hub.yml
+++ b/.github/workflows/docker_hub.yml
@@ -35,10 +35,16 @@ jobs:
     needs: generate-matrix
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+      matrix: 
+        swift_version: ${{ fromJson(needs.generate-matrix.outputs.matrix).swift_version }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Set Mint version
+        id: set-mint-version
+        run: |
+          mint_revision=$(echo '${{ needs.generate-matrix.outputs.matrix }}' | jq -c '.mint_revision' | jq -r '.["${{ matrix.swift_version }}"]')
+          echo "mint-revision=$mint_revision" >> $GITHUB_OUTPUT
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
@@ -89,7 +95,7 @@ jobs:
           tags: ${{ steps.create-tags.outputs.tags }}
           build-args: |
             SWIFT_VERSION=${{ matrix.swift_version }}
-            MINT_REVISION=${{ matrix.mint_revision }}
+            MINT_REVISION=${{ steps.set-mint-version.outputs.mint-revision }}
       - name: Verify Mint revision to check if it needs to update image
         if: ${{ github.event_name != 'workflow_dispatch' }}
         id: needs-update
@@ -116,4 +122,4 @@ jobs:
           tags: ${{ steps.create-tags.outputs.tags }}
           build-args: |
             SWIFT_VERSION=${{ matrix.swift_version }}
-            MINT_REVISION=${{ matrix.mint_revision }}
+            MINT_REVISION=${{ steps.set-mint-version.outputs.mint-revision }}
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 21635c4..2040306 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -30,10 +30,16 @@ jobs:
     needs: generate-matrix
     strategy:
       fail-fast: false
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+      matrix: 
+        swift_version: ${{ fromJson(needs.generate-matrix.outputs.matrix).swift_version }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - name: Set Mint version
+        id: set-mint-version
+        run: |
+          mint_revision=$(echo '${{ needs.generate-matrix.outputs.matrix }}' | jq -c '.mint_revision' | jq -r '.["${{ matrix.swift_version }}"]')
+          echo "mint-revision=$mint_revision" >> $GITHUB_OUTPUT
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build Docker image
@@ -42,10 +48,10 @@ jobs:
         with:
           push: false
           load: true
-          tags: ${{ env.DOCKER_USER }}/${{ env.DOCKER_REPO }}:${{ matrix.swift_version }}-${{ matrix.mint_revision }}
+          tags: ${{ env.DOCKER_USER }}/${{ env.DOCKER_REPO }}:${{ matrix.swift_version }}-${{ steps.set-mint-version.outputs.mint-revision }}
           build-args: |
             SWIFT_VERSION=${{ matrix.swift_version }}
-            MINT_REVISION=${{ matrix.mint_revision }}
+            MINT_REVISION=${{ steps.set-mint-version.outputs.mint-revision }}
       - name: Export versions
         id: export-versions
         run: |