diff --git a/13-3.5/alpine/Dockerfile b/13-3.5/alpine/Dockerfile
index e3f0c2b1..0683342d 100644
--- a/13-3.5/alpine/Dockerfile
+++ b/13-3.5/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:13-alpine3.22
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.3 spatial database extension with PostgreSQL 13 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 13 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION=3.5.3
-ENV POSTGIS_SHA256=44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437
+ENV POSTGIS_VERSION=3.5.4
+ENV POSTGIS_SHA256=7eeef87eabf11aa8cef5f9aa48b03c5632ebae570c3a48e065d48a435d2d1ee4
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \
diff --git a/14-3.5/alpine/Dockerfile b/14-3.5/alpine/Dockerfile
index 6f573811..2868698b 100644
--- a/14-3.5/alpine/Dockerfile
+++ b/14-3.5/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:14-alpine3.22
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.3 spatial database extension with PostgreSQL 14 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 14 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION=3.5.3
-ENV POSTGIS_SHA256=44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437
+ENV POSTGIS_VERSION=3.5.4
+ENV POSTGIS_SHA256=7eeef87eabf11aa8cef5f9aa48b03c5632ebae570c3a48e065d48a435d2d1ee4
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \
diff --git a/15-3.5/alpine/Dockerfile b/15-3.5/alpine/Dockerfile
index 7b6404f8..5862673f 100644
--- a/15-3.5/alpine/Dockerfile
+++ b/15-3.5/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:15-alpine3.22
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.3 spatial database extension with PostgreSQL 15 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 15 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION=3.5.3
-ENV POSTGIS_SHA256=44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437
+ENV POSTGIS_VERSION=3.5.4
+ENV POSTGIS_SHA256=7eeef87eabf11aa8cef5f9aa48b03c5632ebae570c3a48e065d48a435d2d1ee4
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \
diff --git a/16-3.5/alpine/Dockerfile b/16-3.5/alpine/Dockerfile
index d248dde5..c307f52d 100644
--- a/16-3.5/alpine/Dockerfile
+++ b/16-3.5/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:16-alpine3.22
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.3 spatial database extension with PostgreSQL 16 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 16 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION=3.5.3
-ENV POSTGIS_SHA256=44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437
+ENV POSTGIS_VERSION=3.5.4
+ENV POSTGIS_SHA256=7eeef87eabf11aa8cef5f9aa48b03c5632ebae570c3a48e065d48a435d2d1ee4
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \
diff --git a/16-master/Dockerfile b/16-master/Dockerfile
index 58933cac..aa352da5 100644
--- a/16-master/Dockerfile
+++ b/16-master/Dockerfile
@@ -6,7 +6,7 @@
 # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05.
 
 ARG DOCKER_CMAKE_BUILD_TYPE=Release
-ARG CGAL_GIT_BRANCH=master
+ARG CGAL_GIT_BRANCH=main
 FROM postgres:16-bullseye as builder
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
@@ -83,11 +83,30 @@ RUN set -ex \
 ARG DOCKER_CMAKE_BUILD_TYPE
 ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 
+# nlohmann/json - header-only library for SFCGAL (with CMake support)
+RUN set -ex \
+    && mkdir -p /usr/src \
+    && cd /usr/src \
+    # Get the latest release version dynamically
+    && NLOHMANN_JSON_VERSION=$(curl -s https://api.github.com/repos/nlohmann/json/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') \
+    && echo "Installing nlohmann/json version: ${NLOHMANN_JSON_VERSION}" \
+    # Download and extract the full source with CMake support
+    && curl -L "https://github.com/nlohmann/json/archive/refs/tags/v${NLOHMANN_JSON_VERSION}.tar.gz" -o nlohmann-json.tar.gz \
+    && tar -xzf nlohmann-json.tar.gz \
+    && cd "json-${NLOHMANN_JSON_VERSION}" \
+    && mkdir build \
+    && cd build \
+    && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DJSON_BuildTests=OFF \
+    && make install \
+    && cd /usr/src \
+    && rm -rf "json-${NLOHMANN_JSON_VERSION}" nlohmann-json.tar.gz \
+    && echo "nlohmann/json ${NLOHMANN_JSON_VERSION} installed with CMake support" > /_pgis_nlohmann_json_version.txt
+
 # cgal & sfcgal
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
-ENV SFCGAL_GIT_HASH=bac4309ca1c06ee4fc919d32c84dc463da7170e2
+ENV CGAL_GIT_HASH=af9490690393a185fe6c8ff40df158fc3da53c87
+ENV SFCGAL_GIT_HASH=fbe878cac797d3096afec7d954ba8fff9b06ce0a
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -120,7 +139,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
+ENV PROJ_GIT_HASH=160e432571fc9679bb08ea9cda54c153f03a1cc2
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +169,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH=2e12fa312d8ed12b36839ef20c193b49d695f1d4
+ENV GEOS_GIT_HASH=93472ce0f6a02dd5dfcbf8e41eca4e75e714209f
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/libgeos/geos.git \
@@ -166,7 +185,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH=b8d0f72f306e7fc0b5a511d96221277797301be5
+ENV GDAL_GIT_HASH=d424be4b7c9ff3d2c3b3aa98318eb7c04266f210
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +318,11 @@ COPY --from=builder /usr/local /usr/local
 
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
-ENV SFCGAL_GIT_HASH=bac4309ca1c06ee4fc919d32c84dc463da7170e2
-ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
-ENV GEOS_GIT_HASH=2e12fa312d8ed12b36839ef20c193b49d695f1d4
-ENV GDAL_GIT_HASH=b8d0f72f306e7fc0b5a511d96221277797301be5
+ENV CGAL_GIT_HASH=af9490690393a185fe6c8ff40df158fc3da53c87
+ENV SFCGAL_GIT_HASH=fbe878cac797d3096afec7d954ba8fff9b06ce0a
+ENV PROJ_GIT_HASH=160e432571fc9679bb08ea9cda54c153f03a1cc2
+ENV GEOS_GIT_HASH=93472ce0f6a02dd5dfcbf8e41eca4e75e714209f
+ENV GDAL_GIT_HASH=d424be4b7c9ff3d2c3b3aa98318eb7c04266f210
 
 # Minimal command line test ( fail fast )
 RUN set -ex \
@@ -322,7 +341,7 @@ RUN set -ex \
             || echo "ogr2ogr missing PostgreSQL driver" && exit 1
 
 # install postgis
-ENV POSTGIS_GIT_HASH=d1c28c62c4c5de585a11c6b07cd34e7576546d09
+ENV POSTGIS_GIT_HASH=02bd21e4479d98ebe5fac1b25dabe17f91406cf8
 
 RUN set -ex \
     && apt-get update \
diff --git a/17-3.5/alpine/Dockerfile b/17-3.5/alpine/Dockerfile
index 6736e237..5ef2fe8a 100644
--- a/17-3.5/alpine/Dockerfile
+++ b/17-3.5/alpine/Dockerfile
@@ -5,11 +5,11 @@ ARG BASE_IMAGE=postgres:17-alpine3.22
 FROM ${BASE_IMAGE}
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.5.3 spatial database extension with PostgreSQL 17 Alpine" \
+      org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 17 Alpine" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
-ENV POSTGIS_VERSION=3.5.3
-ENV POSTGIS_SHA256=44222ed2b8f742ffc1ceb429b09ebb484c7880f9ba27bf7b6b197346cdd25437
+ENV POSTGIS_VERSION=3.5.4
+ENV POSTGIS_SHA256=7eeef87eabf11aa8cef5f9aa48b03c5632ebae570c3a48e065d48a435d2d1ee4
 
 RUN set -eux \
     && apk add --no-cache --virtual .fetch-deps \
diff --git a/17-master/Dockerfile b/17-master/Dockerfile
index d7700787..db88a396 100644
--- a/17-master/Dockerfile
+++ b/17-master/Dockerfile
@@ -6,7 +6,7 @@
 # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05.
 
 ARG DOCKER_CMAKE_BUILD_TYPE=Release
-ARG CGAL_GIT_BRANCH=master
+ARG CGAL_GIT_BRANCH=main
 FROM postgres:17-bullseye as builder
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
@@ -83,11 +83,30 @@ RUN set -ex \
 ARG DOCKER_CMAKE_BUILD_TYPE
 ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 
+# nlohmann/json - header-only library for SFCGAL (with CMake support)
+RUN set -ex \
+    && mkdir -p /usr/src \
+    && cd /usr/src \
+    # Get the latest release version dynamically
+    && NLOHMANN_JSON_VERSION=$(curl -s https://api.github.com/repos/nlohmann/json/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') \
+    && echo "Installing nlohmann/json version: ${NLOHMANN_JSON_VERSION}" \
+    # Download and extract the full source with CMake support
+    && curl -L "https://github.com/nlohmann/json/archive/refs/tags/v${NLOHMANN_JSON_VERSION}.tar.gz" -o nlohmann-json.tar.gz \
+    && tar -xzf nlohmann-json.tar.gz \
+    && cd "json-${NLOHMANN_JSON_VERSION}" \
+    && mkdir build \
+    && cd build \
+    && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DJSON_BuildTests=OFF \
+    && make install \
+    && cd /usr/src \
+    && rm -rf "json-${NLOHMANN_JSON_VERSION}" nlohmann-json.tar.gz \
+    && echo "nlohmann/json ${NLOHMANN_JSON_VERSION} installed with CMake support" > /_pgis_nlohmann_json_version.txt
+
 # cgal & sfcgal
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
-ENV SFCGAL_GIT_HASH=bac4309ca1c06ee4fc919d32c84dc463da7170e2
+ENV CGAL_GIT_HASH=af9490690393a185fe6c8ff40df158fc3da53c87
+ENV SFCGAL_GIT_HASH=fbe878cac797d3096afec7d954ba8fff9b06ce0a
 RUN set -ex \
     && mkdir -p /usr/src \
     && cd /usr/src \
@@ -120,7 +139,7 @@ RUN set -ex \
     && rm -fr /usr/src/cgal
 
 # proj
-ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
+ENV PROJ_GIT_HASH=160e432571fc9679bb08ea9cda54c153f03a1cc2
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +169,7 @@ RUN set -ex \
     && rm -fr /usr/src/PROJ
 
 # geos
-ENV GEOS_GIT_HASH=2e12fa312d8ed12b36839ef20c193b49d695f1d4
+ENV GEOS_GIT_HASH=93472ce0f6a02dd5dfcbf8e41eca4e75e714209f
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/libgeos/geos.git \
@@ -166,7 +185,7 @@ RUN set -ex \
     && rm -fr /usr/src/geos
 
 # gdal
-ENV GDAL_GIT_HASH=b8d0f72f306e7fc0b5a511d96221277797301be5
+ENV GDAL_GIT_HASH=d424be4b7c9ff3d2c3b3aa98318eb7c04266f210
 RUN set -ex \
     && cd /usr/src \
     && git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +318,11 @@ COPY --from=builder /usr/local /usr/local
 
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
-ENV CGAL_GIT_HASH=b3e2f204a41c1e508a6f018454b60b00aa3dc6fd
-ENV SFCGAL_GIT_HASH=bac4309ca1c06ee4fc919d32c84dc463da7170e2
-ENV PROJ_GIT_HASH=6ef4961358a7525703c0f485b240582530f01b02
-ENV GEOS_GIT_HASH=2e12fa312d8ed12b36839ef20c193b49d695f1d4
-ENV GDAL_GIT_HASH=b8d0f72f306e7fc0b5a511d96221277797301be5
+ENV CGAL_GIT_HASH=af9490690393a185fe6c8ff40df158fc3da53c87
+ENV SFCGAL_GIT_HASH=fbe878cac797d3096afec7d954ba8fff9b06ce0a
+ENV PROJ_GIT_HASH=160e432571fc9679bb08ea9cda54c153f03a1cc2
+ENV GEOS_GIT_HASH=93472ce0f6a02dd5dfcbf8e41eca4e75e714209f
+ENV GDAL_GIT_HASH=d424be4b7c9ff3d2c3b3aa98318eb7c04266f210
 
 # Minimal command line test ( fail fast )
 RUN set -ex \
@@ -322,7 +341,7 @@ RUN set -ex \
             || echo "ogr2ogr missing PostgreSQL driver" && exit 1
 
 # install postgis
-ENV POSTGIS_GIT_HASH=d1c28c62c4c5de585a11c6b07cd34e7576546d09
+ENV POSTGIS_GIT_HASH=02bd21e4479d98ebe5fac1b25dabe17f91406cf8
 
 RUN set -ex \
     && apt-get update \
diff --git a/18-3.6/Dockerfile b/18-3.6/Dockerfile
index e330a059..c68ded1d 100644
--- a/18-3.6/Dockerfile
+++ b/18-3.6/Dockerfile
@@ -5,11 +5,11 @@
 FROM postgres:18-trixie
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
-      org.opencontainers.image.description="PostGIS 3.6.0+dfsg-2.pgdg13+1 spatial database extension with PostgreSQL 18 trixie" \
+      org.opencontainers.image.description="PostGIS 3.6.0+dfsg-3.pgdg13+1 spatial database extension with PostgreSQL 18 trixie" \
       org.opencontainers.image.source="https://github.com/postgis/docker-postgis"
 
 ENV POSTGIS_MAJOR=3
-ENV POSTGIS_VERSION=3.6.0+dfsg-2.pgdg13+1
+ENV POSTGIS_VERSION=3.6.0+dfsg-3.pgdg13+1
 
 RUN apt-get update \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
diff --git a/Dockerfile.master.template b/Dockerfile.master.template
index e0b7af98..2d2f7ed4 100644
--- a/Dockerfile.master.template
+++ b/Dockerfile.master.template
@@ -6,7 +6,7 @@
 # This is a multi-stage Dockerfile, requiring a minimum Docker version of 17.05.
 
 ARG DOCKER_CMAKE_BUILD_TYPE=Release
-ARG CGAL_GIT_BRANCH=master
+ARG CGAL_GIT_BRANCH=main
 FROM postgres:%%PG_MAJOR%%-%%DEBIAN_VERSION%% as builder
 
 LABEL maintainer="PostGIS Project - https://postgis.net" \
@@ -83,6 +83,25 @@ RUN set -ex \
 ARG DOCKER_CMAKE_BUILD_TYPE
 ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
 
+# nlohmann/json - header-only library for SFCGAL (with CMake support)
+RUN set -ex \
+    && mkdir -p /usr/src \
+    && cd /usr/src \
+    # Get the latest release version dynamically
+    && NLOHMANN_JSON_VERSION=$(curl -s https://api.github.com/repos/nlohmann/json/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') \
+    && echo "Installing nlohmann/json version: ${NLOHMANN_JSON_VERSION}" \
+    # Download and extract the full source with CMake support
+    && curl -L "https://github.com/nlohmann/json/archive/refs/tags/v${NLOHMANN_JSON_VERSION}.tar.gz" -o nlohmann-json.tar.gz \
+    && tar -xzf nlohmann-json.tar.gz \
+    && cd "json-${NLOHMANN_JSON_VERSION}" \
+    && mkdir build \
+    && cd build \
+    && cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DJSON_BuildTests=OFF \
+    && make install \
+    && cd /usr/src \
+    && rm -rf "json-${NLOHMANN_JSON_VERSION}" nlohmann-json.tar.gz \
+    && echo "nlohmann/json ${NLOHMANN_JSON_VERSION} installed with CMake support" > /_pgis_nlohmann_json_version.txt
+
 # cgal & sfcgal
 ARG CGAL_GIT_BRANCH
 ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
diff --git a/README.md b/README.md
index 154604ce..b656e188 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This image ensures that the default database created by the parent `postgres` im
 
 Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`.
 
-## Versions (2025-10-11)
+## Versions (2025-11-11)
 
 Supported architecture: `amd64` (x86-64)
 
@@ -75,11 +75,11 @@ Recommended versions for new users are:
 <!-- This part is automatically generated by ./update.sh. Do not modify this section manually. -->
 | DockerHub image | Dockerfile | OS | Postgres | PostGIS |
 | --------------- | ---------- | -- | -------- | ------- |
-| [postgis/postgis:13-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.5/alpine/Dockerfile) | alpine:3.22 | 13 | 3.5.3 |
-| [postgis/postgis:14-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.5/alpine/Dockerfile) | alpine:3.22 | 14 | 3.5.3 |
-| [postgis/postgis:15-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/alpine/Dockerfile) | alpine:3.22 | 15 | 3.5.3 |
-| [postgis/postgis:16-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/alpine/Dockerfile) | alpine:3.22 | 16 | 3.5.3 |
-| [postgis/postgis:17-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/alpine/Dockerfile) | alpine:3.22 | 17 | 3.5.3 |
+| [postgis/postgis:13-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=13-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/13-3.5/alpine/Dockerfile) | alpine:3.22 | 13 | 3.5.4 |
+| [postgis/postgis:14-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=14-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/14-3.5/alpine/Dockerfile) | alpine:3.22 | 14 | 3.5.4 |
+| [postgis/postgis:15-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=15-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/15-3.5/alpine/Dockerfile) | alpine:3.22 | 15 | 3.5.4 |
+| [postgis/postgis:16-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=16-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/16-3.5/alpine/Dockerfile) | alpine:3.22 | 16 | 3.5.4 |
+| [postgis/postgis:17-3.5-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.5-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.5/alpine/Dockerfile) | alpine:3.22 | 17 | 3.5.4 |
 | [postgis/postgis:17-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=17-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/17-3.6/alpine/Dockerfile) | alpine:3.22 | 17 | 3.6.0 |
 | [postgis/postgis:18-3.6-alpine](https://registry.hub.docker.com/r/postgis/postgis/tags?page=1&name=18-3.6-alpine) | [Dockerfile](https://github.com/postgis/docker-postgis/blob/master/18-3.6/alpine/Dockerfile) | alpine:3.22 | 18 | 3.6.0 |
 <!-- alpine_autogenerated_end  -->
diff --git a/update.sh b/update.sh
index efbcef2c..4ee2ffb0 100755
--- a/update.sh
+++ b/update.sh
@@ -52,7 +52,7 @@ declare -A postgisDebPkgNameVersionSuffixes=(
 
 packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/'
 
-cgalGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/master | awk '{ print $1}')"
+cgalGitHash="$(git ls-remote https://github.com/CGAL/cgal.git heads/main | awk '{ print $1}')"
 sfcgalGitHash="$(git ls-remote https://gitlab.com/SFCGAL/SFCGAL.git heads/master | awk '{ print $1}')"
 projGitHash="$(git ls-remote https://github.com/OSGeo/PROJ.git heads/master | awk '{ print $1}')"
 gdalGitHash="$(git ls-remote https://github.com/OSGeo/gdal.git refs/heads/master | grep '\srefs/heads/master' | awk '{ print $1}')"