diff --git a/.github/workflows/jekyll-build.yml b/.github/workflows/jekyll-build.yml
index eab644c0be..f9a35219b4 100644
--- a/.github/workflows/jekyll-build.yml
+++ b/.github/workflows/jekyll-build.yml
@@ -10,18 +10,24 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # Do not change as jeksll/builder id used by GitHub pages (for compatibility)
+        docker-jekyll: [ 'jekyll/builder:latest', 'sylhare/jekyll:latest' ]
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Build the site in the jekyll/builder container
-      run: |
-        docker run \
-        -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
-        sylhare/jekyll:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future"
+      - uses: actions/checkout@v3
+        with:
+          docker-jekyll: ${{ matrix.docker-jekyll }}
+      - name: Build the site in the ${{ matrix.docker-image }} container
+        run: |
+          docker run \
+          -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \
+          ${{ matrix.docker-jekyll }} /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future"
 
-    - name: Install packages
-      continue-on-error: true
-      run: |
-        docker pull sylhare/type-on-strap
-        docker pull sylhare/jekyll
+      - name: Install packages
+        continue-on-error: true
+        run: |
+          docker pull sylhare/type-on-strap
+          docker pull sylhare/jekyll