diff --git a/.github/workflows/build-manual.yaml b/.github/workflows/build-manual.yaml
index 39040777..cad489be 100644
--- a/.github/workflows/build-manual.yaml
+++ b/.github/workflows/build-manual.yaml
@@ -56,6 +56,9 @@ jobs:
       - name: Show config
         run: make show-args
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build extra image
         if: ${{ matrix.stack != 'static' }}
         run: make extra
diff --git a/build.sh b/build.sh
index 54e10cf0..ad5a482f 100755
--- a/build.sh
+++ b/build.sh
@@ -209,7 +209,7 @@ case "$action" in
         ## build images
         # The use of $(tag_arguments) is correct here
         # shellcheck disable=SC2046
-        docker build "$(tag_arguments)" \
+        docker buildx build $(tag_arguments) \
                --build-arg pandoc_commit="${pandoc_commit}" \
                --build-arg pandoc_version="${pandoc_version}" \
                --build-arg without_crossref="${without_crossref}" \
@@ -217,7 +217,10 @@ case "$action" in
                --build-arg base_image_version="${base_image_version}" \
                --build-arg texlive_version="${texlive_version}" \
                --build-arg lua_version="${lua_version}" \
-               --target "${target}"\
+               --target "${target}" \
+               --cache-from type=gha \
+               --cache-to type=gha,mode=max \
+               --output=type=docker
                -f "${directory}${stack}/Dockerfile"\
                "${directory}"
         ;;