diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
index eb267a3..058698c 100644
--- a/.github/workflows/codacy.yml
+++ b/.github/workflows/codacy.yml
@@ -41,6 +41,14 @@ jobs:
 
           max-allowed-issues: 2147483647
 
+      - name: Assign unique categories to SARIF runs
+        # upload-sarif rejects files containing multiple runs with the same
+        # category (derived from automationDetails.id).  Set a distinct id on
+        # every run so CodeQL accepts the upload.
+        # See: https://github.blog/changelog/2025-07-21-code-scanning-will-stop-combining-multiple-sarif-runs-uploaded-in-the-same-sarif-file/
+        run: |
+          jq '.runs |= (to_entries | map(.value.automationDetails.id = "codacy-run-\(.key)" | .value))' results.sarif > results.fixed.sarif && mv results.fixed.sarif results.sarif
+
       - name: Upload SARIF results file
         uses: github/codeql-action/upload-sarif@v4
         with:
diff --git a/docker-base/Dockerfile b/docker-base/Dockerfile
index f3a965b..d7a3e51 100644
--- a/docker-base/Dockerfile
+++ b/docker-base/Dockerfile
@@ -65,7 +65,7 @@ RUN set -eux; \
     cd /usr/src/php; \
     gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
     debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-    if [ ! -d /usr/include/curl ]; then \
+    if [ ! -d /usr/include/curl ] && [ ! -e /usr/local/include/curl ]; then \
         ln -sT "/usr/include/$debMultiarch/curl" /usr/local/include/curl; \
     fi; \
     export \