diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 859c4416..7a39f65e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,16 +37,16 @@ jobs:
 # --skip-- - { version: "14-3.4", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bookworm 14-3.4.0-bookworm 14-3.4", readme_group: "bookworm" }
            - { version: "14-3.4", variant: "bullseye", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bullseye 14-3.4.0-bullseye", readme_group: "bullseye" }
            - { version: "14-3.4-bundle0", variant: "bookworm", postgres: "14", postgis: "3.4", arch: "amd64 arm64", tags: "14-3.4-bundle0-bookworm 14-3.4.0-bundle0-bookworm 14-3.4-bundle0", readme_group: "bundle0" }
-           - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine", readme_group: "alpine3.18" }
-# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest", readme_group: "bookworm" }
+           - { version: "15-3.4", variant: "alpine3.18", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine", readme_group: "alpine3.18" }
+# --skip-- - { version: "15-3.4", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4", readme_group: "bookworm" }
            - { version: "15-3.4", variant: "bullseye", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bullseye 15-3.4.0-bullseye", readme_group: "bullseye" }
-           - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0", readme_group: "bundle0" }
+           - { version: "15-3.4-bundle0", variant: "bookworm", postgres: "15", postgis: "3.4", arch: "amd64 arm64", tags: "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0", readme_group: "bundle0" }
            - { version: "15-master", variant: "bookworm", postgres: "15", postgis: "master", arch: "amd64 arm64", tags: "15-master-bookworm 15-master", readme_group: "test" }
            - { version: "15-recent", variant: "bookworm", postgres: "15", postgis: "recent", arch: "amd64 arm64", tags: "15-recent-bookworm 15-recent", readme_group: "recent" }
-           - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine", readme_group: "alpine3.18" }
-# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4", readme_group: "bookworm" }
+           - { version: "16-3.4", variant: "alpine3.18", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine", readme_group: "alpine3.18" }
+# --skip-- - { version: "16-3.4", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest", readme_group: "bookworm" }
            - { version: "16-3.4", variant: "bullseye", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bullseye 16-3.4.0-bullseye", readme_group: "bullseye" }
-           - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0", readme_group: "bundle0" }
+           - { version: "16-3.4-bundle0", variant: "bookworm", postgres: "16", postgis: "3.4", arch: "amd64 arm64", tags: "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0", readme_group: "bundle0" }
            - { version: "16-master", variant: "bookworm", postgres: "16", postgis: "master", arch: "amd64 arm64", tags: "16-master-bookworm 16-master", readme_group: "test" }
            - { version: "16-recent", variant: "bookworm", postgres: "16", postgis: "recent", arch: "amd64 arm64", tags: "16-recent-bookworm 16-recent", readme_group: "recent" }
 #matrix-include-end
diff --git a/14-3.4-bundle0/bookworm/Dockerfile b/14-3.4-bundle0/bookworm/Dockerfile
index 8d514cc6..d0504d79 100644
--- a/14-3.4-bundle0/bookworm/Dockerfile
+++ b/14-3.4-bundle0/bookworm/Dockerfile
@@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49
 
 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false
 ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git
-ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1
-ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380
+ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2
+ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee
 
 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git
 ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL14_1_4_2
@@ -72,6 +72,13 @@ RUN set -eux \
       zlib1g-dev \
       # sqlite_fdw
       sqlite3 \
+      # plv8
+      ninja-build \
+      pkg-config \
+      # bytemagic
+      libmagic-dev \
+      # pgsoudium \
+      libsodium-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -177,20 +184,29 @@ RUN set -eux \
 
 FROM builder as builder-pgxn
 
+RUN pgxn install --verbose byteamagic
 RUN pgxn install --verbose ddlx
+RUN pgxn install --verbose dsef
 RUN pgxn install --verbose h3        # https://github.com/zachasme/h3-pg
 RUN pgxn install --verbose json_accessors
 RUN pgxn install --verbose lostgis
+RUN pgxn install --verbose orafce
 RUN pgxn install --verbose parray_gin
+RUN pgxn install --verbose permuteseq
 RUN pgxn install --verbose pg_curl   # https://github.com/RekGRpth/pg_curl
 RUN pgxn install --verbose pg_roaringbitmap
 RUN pgxn install --verbose pg_rowalesce
 RUN pgxn install --verbose pg_uuidv7
 RUN pgxn install --verbose pg_xenophile
 RUN pgxn install --verbose pg_xxhash
+RUN pgxn install --verbose pgsodium
 RUN pgxn install --verbose pgsql_tweaks
-
 RUN USE_PGXS=1 pgxn install sqlite_fdw
+# RUN pgxn install --verbose plv8 # todo: need to fix build
+# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check
+# RUN pgxn install --verbose pg_bm25  # need rust
+
+# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c
 
 
 FROM builder as builder-other
@@ -282,6 +298,7 @@ RUN set -eux \
         pgtop \
         pspg \
         \
+        \
         postgresql-$PG_MAJOR-asn1oid \
         postgresql-$PG_MAJOR-cron \
         postgresql-$PG_MAJOR-decoderbufs \
@@ -292,33 +309,40 @@ RUN set -eux \
         postgresql-$PG_MAJOR-icu-ext \
         postgresql-$PG_MAJOR-jsquery \
         postgresql-$PG_MAJOR-numeral \
+        postgresql-$PG_MAJOR-partman \
+        postgresql-$PG_MAJOR-periods \
+        postgresql-$PG_MAJOR-pg-fact-loader \
         postgresql-$PG_MAJOR-pg-failover-slots \
         postgresql-$PG_MAJOR-pg-stat-kcache \
         postgresql-$PG_MAJOR-pgaudit \
+#       postgresql-$PG_MAJOR-pgdg-pgroonga \  # todo: check
+        postgresql-$PG_MAJOR-pglogical \
         postgresql-$PG_MAJOR-pgmp \
         postgresql-$PG_MAJOR-pgpcre \
         postgresql-$PG_MAJOR-pgq3 \
         postgresql-$PG_MAJOR-pgsphere \
         postgresql-$PG_MAJOR-pgtap \
         postgresql-$PG_MAJOR-pldebugger \
-        postgresql-$PG_MAJOR-prefix \
+        postgresql-$PG_MAJOR-plpgsql-check \
         postgresql-$PG_MAJOR-prefix \
         postgresql-$PG_MAJOR-prioritize \
         postgresql-$PG_MAJOR-q3c \
         postgresql-$PG_MAJOR-repack \
         postgresql-$PG_MAJOR-rum \
-        \
-        postgresql-$PG_MAJOR-partman \
-        postgresql-$PG_MAJOR-pg-fact-loader \
-        postgresql-$PG_MAJOR-pglogical \
-        postgresql-$PG_MAJOR-plpgsql-check \
-        postgresql-$PG_MAJOR-pointcloud \
+        postgresql-$PG_MAJOR-show-plans \
         postgresql-$PG_MAJOR-squeeze \
+        postgresql-$PG_MAJOR-pointcloud \
         #
         # add MobilityDb missing dependency from libgsl-dev
         libgsl27 \
+        # MeCab based tokenizer for pgdg-pgroonga
+        groonga-tokenizer-mecab \
+        # bytemagic
+        libmagic1 libmagic-mgc \
+        # pgsodium
+        libsodium23 \
     \
-    # && pip3 install --upgrade pip \
+#    && pip3 install --upgrade pip \
     \
 #    && pipx install geopy \
 #    && pipx install plpygis \
diff --git a/15-3.4-bundle0/bookworm/Dockerfile b/15-3.4-bundle0/bookworm/Dockerfile
index a9c6b6b5..468f9169 100644
--- a/15-3.4-bundle0/bookworm/Dockerfile
+++ b/15-3.4-bundle0/bookworm/Dockerfile
@@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49
 
 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false
 ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git
-ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1
-ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380
+ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2
+ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee
 
 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git
 ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL15_1_5_1
@@ -72,6 +72,13 @@ RUN set -eux \
       zlib1g-dev \
       # sqlite_fdw
       sqlite3 \
+      # plv8
+      ninja-build \
+      pkg-config \
+      # bytemagic
+      libmagic-dev \
+      # pgsoudium \
+      libsodium-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -177,20 +184,29 @@ RUN set -eux \
 
 FROM builder as builder-pgxn
 
+RUN pgxn install --verbose byteamagic
 RUN pgxn install --verbose ddlx
+RUN pgxn install --verbose dsef
 RUN pgxn install --verbose h3        # https://github.com/zachasme/h3-pg
 RUN pgxn install --verbose json_accessors
 RUN pgxn install --verbose lostgis
+RUN pgxn install --verbose orafce
 RUN pgxn install --verbose parray_gin
+RUN pgxn install --verbose permuteseq
 RUN pgxn install --verbose pg_curl   # https://github.com/RekGRpth/pg_curl
 RUN pgxn install --verbose pg_roaringbitmap
 RUN pgxn install --verbose pg_rowalesce
 RUN pgxn install --verbose pg_uuidv7
 RUN pgxn install --verbose pg_xenophile
 RUN pgxn install --verbose pg_xxhash
+RUN pgxn install --verbose pgsodium
 RUN pgxn install --verbose pgsql_tweaks
-
 RUN USE_PGXS=1 pgxn install sqlite_fdw
+# RUN pgxn install --verbose plv8 # todo: need to fix build
+# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check
+# RUN pgxn install --verbose pg_bm25  # need rust
+
+# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c
 
 
 FROM builder as builder-other
@@ -282,6 +298,7 @@ RUN set -eux \
         pgtop \
         pspg \
         \
+        \
         postgresql-$PG_MAJOR-asn1oid \
         postgresql-$PG_MAJOR-cron \
         postgresql-$PG_MAJOR-decoderbufs \
@@ -292,33 +309,40 @@ RUN set -eux \
         postgresql-$PG_MAJOR-icu-ext \
         postgresql-$PG_MAJOR-jsquery \
         postgresql-$PG_MAJOR-numeral \
+        postgresql-$PG_MAJOR-partman \
+        postgresql-$PG_MAJOR-periods \
+        postgresql-$PG_MAJOR-pg-fact-loader \
         postgresql-$PG_MAJOR-pg-failover-slots \
         postgresql-$PG_MAJOR-pg-stat-kcache \
         postgresql-$PG_MAJOR-pgaudit \
+#       postgresql-$PG_MAJOR-pgdg-pgroonga \  # todo: check
+        postgresql-$PG_MAJOR-pglogical \
         postgresql-$PG_MAJOR-pgmp \
         postgresql-$PG_MAJOR-pgpcre \
         postgresql-$PG_MAJOR-pgq3 \
         postgresql-$PG_MAJOR-pgsphere \
         postgresql-$PG_MAJOR-pgtap \
         postgresql-$PG_MAJOR-pldebugger \
-        postgresql-$PG_MAJOR-prefix \
+        postgresql-$PG_MAJOR-plpgsql-check \
         postgresql-$PG_MAJOR-prefix \
         postgresql-$PG_MAJOR-prioritize \
         postgresql-$PG_MAJOR-q3c \
         postgresql-$PG_MAJOR-repack \
         postgresql-$PG_MAJOR-rum \
-        \
-        postgresql-$PG_MAJOR-partman \
-        postgresql-$PG_MAJOR-pg-fact-loader \
-        postgresql-$PG_MAJOR-pglogical \
-        postgresql-$PG_MAJOR-plpgsql-check \
-        postgresql-$PG_MAJOR-pointcloud \
+        postgresql-$PG_MAJOR-show-plans \
         postgresql-$PG_MAJOR-squeeze \
+        postgresql-$PG_MAJOR-pointcloud \
         #
         # add MobilityDb missing dependency from libgsl-dev
         libgsl27 \
+        # MeCab based tokenizer for pgdg-pgroonga
+        groonga-tokenizer-mecab \
+        # bytemagic
+        libmagic1 libmagic-mgc \
+        # pgsodium
+        libsodium23 \
     \
-    # && pip3 install --upgrade pip \
+#    && pip3 install --upgrade pip \
     \
 #    && pipx install geopy \
 #    && pipx install plpygis \
diff --git a/15-3.4-bundle0/bookworm/tags b/15-3.4-bundle0/bookworm/tags
index c3e2f82c..38cd245b 100644
--- a/15-3.4-bundle0/bookworm/tags
+++ b/15-3.4-bundle0/bookworm/tags
@@ -1 +1 @@
-15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0
+15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0
diff --git a/15-3.4/alpine3.18/tags b/15-3.4/alpine3.18/tags
index efefe6a4..7c8ad00e 100644
--- a/15-3.4/alpine3.18/tags
+++ b/15-3.4/alpine3.18/tags
@@ -1 +1 @@
-15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine
+15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine
diff --git a/15-3.4/bookworm/tags b/15-3.4/bookworm/tags
index c3385ab2..d4dfc3cc 100644
--- a/15-3.4/bookworm/tags
+++ b/15-3.4/bookworm/tags
@@ -1 +1 @@
-15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest
+15-3.4-bookworm 15-3.4.0-bookworm 15-3.4
diff --git a/15-master/bookworm/Dockerfile b/15-master/bookworm/Dockerfile
index 2879f9d0..62ce5711 100644
--- a/15-master/bookworm/Dockerfile
+++ b/15-master/bookworm/Dockerfile
@@ -15,12 +15,12 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git
 ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git
 ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git
 
-ARG PGIS1_POSTGIS_CHECKOUT=b178091a9833febf41d6d9f388804a414a26421a
+ARG PGIS1_POSTGIS_CHECKOUT=6926524812f3f78bf570526539761f495aa4b9d2
 ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875
-ARG PGIS1_GDAL_CHECKOUT=7c78481624c632a996915195b298190c23c3cc2e
-ARG PGIS1_PROJ_CHECKOUT=61003c9550925bcfc7c0ab37f3c64fc6c29c46a4
+ARG PGIS1_GDAL_CHECKOUT=e314bd5b637fb79215890fa87b630bcf4520713a
+ARG PGIS1_PROJ_CHECKOUT=e8711e659ffde7f5809538669aa0f15c88bb0665
 ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa
-ARG PGIS1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c
+ARG PGIS1_CGAL_CHECKOUT=4ee9d15c9f4c544680536b7fca4c8016eb092651
 
 ARG PGIS1_BOOST_VERSION=1.74.0
 
diff --git a/16-3.4-bundle0/bookworm/Dockerfile b/16-3.4-bundle0/bookworm/Dockerfile
index 2e7f55f5..732be257 100644
--- a/16-3.4-bundle0/bookworm/Dockerfile
+++ b/16-3.4-bundle0/bookworm/Dockerfile
@@ -32,8 +32,8 @@ ARG PGIS1_PGSQL_GZIP_CHECKOUT_SHA1=7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49
 
 ARG PGIS1_TIMESCALEDB_APACHE_ONLY=false
 ARG PGIS1_TIMESCALEDB_REPOSITORY=https://github.com/timescale/timescaledb.git
-ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.1
-ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=c93faddbe95e45d93a53c3f652e2033558e8b380
+ARG PGIS1_TIMESCALEDB_CHECKOUT=tags/2.12.2
+ARG PGIS1_TIMESCALEDB_CHECKOUT_SHA1=2a39fbb444888bbba9139c7f7ab84f2aa28509ee
 
 ARG PGIS1_PG_HINT_PLAN_REPOSITORY=https://github.com/ossc-db/pg_hint_plan.git
 ARG PGIS1_PG_HINT_PLAN_CHECKOUT=tags/REL16_1_6_0
@@ -72,6 +72,13 @@ RUN set -eux \
       zlib1g-dev \
       # sqlite_fdw
       sqlite3 \
+      # plv8
+      ninja-build \
+      pkg-config \
+      # bytemagic
+      libmagic-dev \
+      # pgsoudium \
+      libsodium-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -152,21 +159,29 @@ RUN set -eux \
 
 FROM builder as builder-pgxn
 
+RUN pgxn install --verbose byteamagic
 RUN pgxn install --verbose ddlx
+RUN pgxn install --verbose dsef
 RUN pgxn install --verbose h3        # https://github.com/zachasme/h3-pg
 RUN pgxn install --verbose json_accessors
 RUN pgxn install --verbose lostgis
+RUN pgxn install --verbose orafce
 RUN pgxn install --verbose parray_gin
+RUN pgxn install --verbose permuteseq
 RUN pgxn install --verbose pg_curl   # https://github.com/RekGRpth/pg_curl
 RUN pgxn install --verbose pg_roaringbitmap
 RUN pgxn install --verbose pg_rowalesce
 RUN pgxn install --verbose pg_uuidv7
 RUN pgxn install --verbose pg_xenophile
 RUN pgxn install --verbose pg_xxhash
+RUN pgxn install --verbose pgsodium
 RUN pgxn install --verbose pgsql_tweaks
+RUN USE_PGXS=1 pgxn install sqlite_fdw
+# RUN pgxn install --verbose plv8 # todo: need to fix build
+# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check
+# RUN pgxn install --verbose pg_bm25  # need rust
 
-# sqlite_fdw not supported on pg16 yet
-# RUN USE_PGXS=1 pgxn install sqlite_fdw
+# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c
 
 
 FROM builder as builder-other
@@ -251,6 +266,7 @@ RUN set -eux \
         pgtop \
         pspg \
         \
+        \
         postgresql-$PG_MAJOR-asn1oid \
         postgresql-$PG_MAJOR-cron \
         postgresql-$PG_MAJOR-decoderbufs \
@@ -261,36 +277,42 @@ RUN set -eux \
         postgresql-$PG_MAJOR-icu-ext \
         postgresql-$PG_MAJOR-jsquery \
         postgresql-$PG_MAJOR-numeral \
+        postgresql-$PG_MAJOR-partman \
+        postgresql-$PG_MAJOR-periods \
+        postgresql-$PG_MAJOR-pg-fact-loader \
         postgresql-$PG_MAJOR-pg-failover-slots \
         postgresql-$PG_MAJOR-pg-stat-kcache \
         postgresql-$PG_MAJOR-pgaudit \
+#       postgresql-$PG_MAJOR-pgdg-pgroonga \  # todo: check
+        postgresql-$PG_MAJOR-pglogical \
         postgresql-$PG_MAJOR-pgmp \
         postgresql-$PG_MAJOR-pgpcre \
         postgresql-$PG_MAJOR-pgq3 \
         postgresql-$PG_MAJOR-pgsphere \
         postgresql-$PG_MAJOR-pgtap \
         postgresql-$PG_MAJOR-pldebugger \
-        postgresql-$PG_MAJOR-prefix \
+        postgresql-$PG_MAJOR-plpgsql-check \
         postgresql-$PG_MAJOR-prefix \
         postgresql-$PG_MAJOR-prioritize \
         postgresql-$PG_MAJOR-q3c \
         postgresql-$PG_MAJOR-repack \
         postgresql-$PG_MAJOR-rum \
-        \
+        postgresql-$PG_MAJOR-show-plans \
+        postgresql-$PG_MAJOR-squeeze \
 #
 #  not yet available for 16
-#        postgresql-$PG_MAJOR-partman \
-#        postgresql-$PG_MAJOR-pg-fact-loader \
-#        postgresql-$PG_MAJOR-pglogical \
-#        postgresql-$PG_MAJOR-plpgsql-check \
 #        postgresql-$PG_MAJOR-pointcloud \
-#        postgresql-$PG_MAJOR-squeeze \
-#
         #
         # add MobilityDb missing dependency from libgsl-dev
         libgsl27 \
+        # MeCab based tokenizer for pgdg-pgroonga
+        groonga-tokenizer-mecab \
+        # bytemagic
+        libmagic1 libmagic-mgc \
+        # pgsodium
+        libsodium23 \
     \
-    # && pip3 install --upgrade pip \
+#    && pip3 install --upgrade pip \
     \
 #    && pipx install geopy \
 #    && pipx install plpygis \
diff --git a/16-3.4-bundle0/bookworm/tags b/16-3.4-bundle0/bookworm/tags
index 451463d9..1fe9762e 100644
--- a/16-3.4-bundle0/bookworm/tags
+++ b/16-3.4-bundle0/bookworm/tags
@@ -1 +1 @@
-16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0
+16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0
diff --git a/16-3.4/alpine3.18/tags b/16-3.4/alpine3.18/tags
index 70989ffa..b59d7248 100644
--- a/16-3.4/alpine3.18/tags
+++ b/16-3.4/alpine3.18/tags
@@ -1 +1 @@
-16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine
+16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine
diff --git a/16-3.4/bookworm/tags b/16-3.4/bookworm/tags
index 4aaa8915..099c9151 100644
--- a/16-3.4/bookworm/tags
+++ b/16-3.4/bookworm/tags
@@ -1 +1 @@
-16-3.4-bookworm 16-3.4.0-bookworm 16-3.4
+16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest
diff --git a/16-master/bookworm/Dockerfile b/16-master/bookworm/Dockerfile
index a0adaeff..6fefcec7 100644
--- a/16-master/bookworm/Dockerfile
+++ b/16-master/bookworm/Dockerfile
@@ -15,12 +15,12 @@ ARG PGIS1_PROJ_REPOSITORY=https://github.com/OSGeo/PROJ.git
 ARG PGIS1_SFCGAL_REPOSITORY=https://gitlab.com/Oslandia/SFCGAL.git
 ARG PGIS1_CGAL_REPOSITORY=https://github.com/CGAL/cgal.git
 
-ARG PGIS1_POSTGIS_CHECKOUT=b178091a9833febf41d6d9f388804a414a26421a
+ARG PGIS1_POSTGIS_CHECKOUT=6926524812f3f78bf570526539761f495aa4b9d2
 ARG PGIS1_GEOS_CHECKOUT=28d70a2e4582edcd3625659f70e31d1853423875
-ARG PGIS1_GDAL_CHECKOUT=7c78481624c632a996915195b298190c23c3cc2e
-ARG PGIS1_PROJ_CHECKOUT=61003c9550925bcfc7c0ab37f3c64fc6c29c46a4
+ARG PGIS1_GDAL_CHECKOUT=e314bd5b637fb79215890fa87b630bcf4520713a
+ARG PGIS1_PROJ_CHECKOUT=e8711e659ffde7f5809538669aa0f15c88bb0665
 ARG PGIS1_SFCGAL_CHECKOUT=34f5a2e5e91a730121128f75d2ef4b55bb8e2afa
-ARG PGIS1_CGAL_CHECKOUT=3c8e2053721271119499506ea1d8a49dee89e30c
+ARG PGIS1_CGAL_CHECKOUT=4ee9d15c9f4c544680536b7fca4c8016eb092651
 
 ARG PGIS1_BOOST_VERSION=1.74.0
 
diff --git a/Dockerfile.bundle0.template b/Dockerfile.bundle0.template
index 211260b6..5eafed66 100644
--- a/Dockerfile.bundle0.template
+++ b/Dockerfile.bundle0.template
@@ -67,6 +67,13 @@ RUN set -eux \
       zlib1g-dev \
       # sqlite_fdw
       sqlite3 \
+      # plv8
+      ninja-build \
+      pkg-config \
+      # bytemagic
+      libmagic-dev \
+      # pgsoudium \
+      libsodium-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
@@ -176,25 +183,29 @@ RUN set -eux \
 
 FROM builder as builder-pgxn
 
+RUN pgxn install --verbose byteamagic
 RUN pgxn install --verbose ddlx
+RUN pgxn install --verbose dsef
 RUN pgxn install --verbose h3        # https://github.com/zachasme/h3-pg
 RUN pgxn install --verbose json_accessors
 RUN pgxn install --verbose lostgis
+RUN pgxn install --verbose orafce
 RUN pgxn install --verbose parray_gin
+RUN pgxn install --verbose permuteseq
 RUN pgxn install --verbose pg_curl   # https://github.com/RekGRpth/pg_curl
 RUN pgxn install --verbose pg_roaringbitmap
 RUN pgxn install --verbose pg_rowalesce
 RUN pgxn install --verbose pg_uuidv7
 RUN pgxn install --verbose pg_xenophile
 RUN pgxn install --verbose pg_xxhash
+RUN pgxn install --verbose pgsodium
 RUN pgxn install --verbose pgsql_tweaks
-
-{{ if env.version | startswith("16") then ( -}}
-# sqlite_fdw not supported on pg16 yet
-# RUN USE_PGXS=1 pgxn install sqlite_fdw
-{{ ) else ( -}}
 RUN USE_PGXS=1 pgxn install sqlite_fdw
-{{ ) end -}}
+# RUN pgxn install --verbose plv8 # todo: need to fix build
+# RUN USE_PGXS=1 pgxn install sqlite_fdw : todo check
+# RUN pgxn install --verbose pg_bm25  # need rust
+
+# todo add libpgosm ; https://github.com/developmentseed/osm-seed/blob/develop/images/db/lib/quad_tile/quad_tile.c
 
 
 FROM builder as builder-other
@@ -290,6 +301,7 @@ RUN set -eux \
         pgtop \
         pspg \
         \
+        \
         postgresql-$PG_MAJOR-asn1oid \
         postgresql-$PG_MAJOR-cron \
         postgresql-$PG_MAJOR-decoderbufs \
@@ -300,45 +312,46 @@ RUN set -eux \
         postgresql-$PG_MAJOR-icu-ext \
         postgresql-$PG_MAJOR-jsquery \
         postgresql-$PG_MAJOR-numeral \
+        postgresql-$PG_MAJOR-partman \
+        postgresql-$PG_MAJOR-periods \
+        postgresql-$PG_MAJOR-pg-fact-loader \
         postgresql-$PG_MAJOR-pg-failover-slots \
         postgresql-$PG_MAJOR-pg-stat-kcache \
         postgresql-$PG_MAJOR-pgaudit \
+#       postgresql-$PG_MAJOR-pgdg-pgroonga \  # todo: check
+        postgresql-$PG_MAJOR-pglogical \
         postgresql-$PG_MAJOR-pgmp \
         postgresql-$PG_MAJOR-pgpcre \
         postgresql-$PG_MAJOR-pgq3 \
         postgresql-$PG_MAJOR-pgsphere \
         postgresql-$PG_MAJOR-pgtap \
         postgresql-$PG_MAJOR-pldebugger \
-        postgresql-$PG_MAJOR-prefix \
+        postgresql-$PG_MAJOR-plpgsql-check \
         postgresql-$PG_MAJOR-prefix \
         postgresql-$PG_MAJOR-prioritize \
         postgresql-$PG_MAJOR-q3c \
         postgresql-$PG_MAJOR-repack \
         postgresql-$PG_MAJOR-rum \
-        \
+        postgresql-$PG_MAJOR-show-plans \
+        postgresql-$PG_MAJOR-squeeze \
 {{ if env.version | startswith("16") then ( -}}
 #
 #  not yet available for 16
-#        postgresql-$PG_MAJOR-partman \
-#        postgresql-$PG_MAJOR-pg-fact-loader \
-#        postgresql-$PG_MAJOR-pglogical \
-#        postgresql-$PG_MAJOR-plpgsql-check \
 #        postgresql-$PG_MAJOR-pointcloud \
-#        postgresql-$PG_MAJOR-squeeze \
-#
 {{ ) else ( -}}
-        postgresql-$PG_MAJOR-partman \
-        postgresql-$PG_MAJOR-pg-fact-loader \
-        postgresql-$PG_MAJOR-pglogical \
-        postgresql-$PG_MAJOR-plpgsql-check \
         postgresql-$PG_MAJOR-pointcloud \
-        postgresql-$PG_MAJOR-squeeze \
 {{ ) end -}}
         #
         # add MobilityDb missing dependency from libgsl-dev
         libgsl27 \
+        # MeCab based tokenizer for pgdg-pgroonga
+        groonga-tokenizer-mecab \
+        # bytemagic
+        libmagic1 libmagic-mgc \
+        # pgsodium
+        libsodium23 \
     \
-    # && pip3 install --upgrade pip \
+#    && pip3 install --upgrade pip \
     \
 #    && pipx install geopy \
 #    && pipx install plpygis \
diff --git a/README.md b/README.md
index 41c97885..57eef862 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@
 
 ------------------------
 # 🐳🐘🌍 postgis/postgis
-[![Build Status](https://github.com/imresamu/docker-postgis/workflows/Docker%20PostGIS%20CI/badge.svg)](https://github.com/imresamu/docker-postgis/actions) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://github.com/imresamu/docker-postgis/workflows/Build%20PostGIS%20images/badge.svg)](https://github.com/imresamu/docker-postgis/actions) [![Join the chat at https://gitter.im/postgis/docker-postgis](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/postgis/docker-postgis?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16beta3. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4.  Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches.
+The `imresamu/postgis` image provides tags for running Postgres with [PostGIS](http://postgis.net/) extensions installed. This image is based on the official [`postgres`](https://registry.hub.docker.com/_/postgres/) image and provides debian and alpine variants for PostGIS 3.4.x, which is compatible with PostgreSQL versions 12, 13, 14, 15, and 16. For PostgreSQL version 11, the image supports PostGIS 3.3, as it is not compatible with PostGIS 3.4.  Additionally, an image version is provided which is built from the latest two versions of Postgres (15, 16) with versions of PostGIS and its dependencies built from their respective master branches.
 
 This image ensures that the default database created by the parent `postgres` image will have the following extensions installed:
 
@@ -27,7 +27,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 (2023-10-14)
+## Versions (2023-10-21)
 
 We provide multi-platform image support for the following architectures:
 
@@ -64,8 +64,8 @@ For those new to PostGIS, we recommend the following image versions:
 | [`12-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-bookworm), [`12-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-bookworm), [`12-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 12 | 3.4.0 |
 | [`13-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-bookworm), [`13-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-bookworm), [`13-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 13 | 3.4.0 |
 | [`14-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bookworm), [`14-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bookworm), [`14-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 |
-| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 |
-| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 |
+| [`15-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bookworm), [`15-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bookworm), [`15-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 |
+| [`16-3.4-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bookworm), [`16-3.4.0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bookworm), [`16-3.4`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4), [`latest`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=latest) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 |
 <!-- bookworm_end  -->
 
 ### 📘Debian - bullseye
@@ -107,8 +107,8 @@ Please note that the included package list is subject to change as we continue t
 | `imresamu/postgis-amd64:` tags | Dockerfile | Arch | OS | Postgres | PostGIS |
 | ---- | :-: | :-: | :-: | :-: | :-: |
 | [`14-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0-bookworm), [`14-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-bundle0-bookworm), [`14-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 14 | 3.4.0 |
-| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 |
-| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 |
+| [`15-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0-bookworm), [`15-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-bundle0-bookworm), [`15-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 15 | 3.4.0 |
+| [`16-3.4-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0-bookworm), [`16-3.4.0-bundle0-bookworm`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-bundle0-bookworm), [`16-3.4-bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-bundle0), [`bundle0`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=bundle0) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4-bundle0/bookworm/Dockerfile) | amd64 arm64 | bookworm | 16 | 3.4.0 |
 <!-- bundle0_end  -->
 
 ### ⛰️Alpine based
@@ -125,8 +125,8 @@ Please note that the included package list is subject to change as we continue t
 | [`12-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine3.18), [`12-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4.0-alpine3.18), [`12-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=12-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/12-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 12 | 3.4.0 |
 | [`13-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine3.18), [`13-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4.0-alpine3.18), [`13-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=13-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/13-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 13 | 3.4.0 |
 | [`14-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine3.18), [`14-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4.0-alpine3.18), [`14-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=14-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/14-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 14 | 3.4.0 |
-| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 |
-| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 |
+| [`15-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine3.18), [`15-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4.0-alpine3.18), [`15-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=15-3.4-alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/15-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 15 | 3.4.0 |
+| [`16-3.4-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine3.18), [`16-3.4.0-alpine3.18`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4.0-alpine3.18), [`16-3.4-alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=16-3.4-alpine), [`alpine`](https://registry.hub.docker.com/r/imresamu/postgis/tags?page=1&name=alpine) | [Dockerfile](https://github.com/imresamu/docker-postgis/blob/master/16-3.4/alpine3.18/Dockerfile) | amd64 arm64 | alpine3.18 | 16 | 3.4.0 |
 <!-- alpine3.18_end  -->
 
 ### 📋Test images
diff --git a/manifest.sh b/manifest.sh
index 3255c702..1fdb7817 100755
--- a/manifest.sh
+++ b/manifest.sh
@@ -268,12 +268,6 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:15-3.4-alpine \
     --target ${dockername}:15-3.4-alpine || true
 
-echo "manifest: ${dockername}:alpine"
-manifest-tool push from-args \
-    --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:alpine \
-    --target ${dockername}:alpine || true
-
 # ----- 15-3.4-bookworm -----
 
 echo "manifest: ${dockername}:15-3.4-bookworm"
@@ -294,12 +288,6 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:15-3.4 \
     --target ${dockername}:15-3.4 || true
 
-echo "manifest: ${dockername}:latest"
-manifest-tool push from-args \
-    --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:latest \
-    --target ${dockername}:latest || true
-
 # ----- 15-3.4-bullseye -----
 
 echo "manifest: ${dockername}:15-3.4-bullseye"
@@ -334,12 +322,6 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:15-3.4-bundle0 \
     --target ${dockername}:15-3.4-bundle0 || true
 
-echo "manifest: ${dockername}:bundle0"
-manifest-tool push from-args \
-    --platforms linux/amd64,linux/arm64 \
-    --template ${dockername}-ARCHVARIANT:bundle0 \
-    --target ${dockername}:bundle0 || true
-
 # ----- 15-master-bookworm -----
 
 echo "manifest: ${dockername}:15-master-bookworm"
@@ -388,6 +370,12 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:16-3.4-alpine \
     --target ${dockername}:16-3.4-alpine || true
 
+echo "manifest: ${dockername}:alpine"
+manifest-tool push from-args \
+    --platforms linux/amd64,linux/arm64 \
+    --template ${dockername}-ARCHVARIANT:alpine \
+    --target ${dockername}:alpine || true
+
 # ----- 16-3.4-bookworm -----
 
 echo "manifest: ${dockername}:16-3.4-bookworm"
@@ -408,6 +396,12 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:16-3.4 \
     --target ${dockername}:16-3.4 || true
 
+echo "manifest: ${dockername}:latest"
+manifest-tool push from-args \
+    --platforms linux/amd64,linux/arm64 \
+    --template ${dockername}-ARCHVARIANT:latest \
+    --target ${dockername}:latest || true
+
 # ----- 16-3.4-bullseye -----
 
 echo "manifest: ${dockername}:16-3.4-bullseye"
@@ -442,6 +436,12 @@ manifest-tool push from-args \
     --template ${dockername}-ARCHVARIANT:16-3.4-bundle0 \
     --target ${dockername}:16-3.4-bundle0 || true
 
+echo "manifest: ${dockername}:bundle0"
+manifest-tool push from-args \
+    --platforms linux/amd64,linux/arm64 \
+    --template ${dockername}-ARCHVARIANT:bundle0 \
+    --target ${dockername}:bundle0 || true
+
 # ----- 16-master-bookworm -----
 
 echo "manifest: ${dockername}:16-master-bookworm"
diff --git a/versions.json b/versions.json
index 3f3da3ac..c1f2f7f9 100644
--- a/versions.json
+++ b/versions.json
@@ -162,8 +162,8 @@
       "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be",
       "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0",
       "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49",
-      "TIMESCALEDB_CHECKOUT": "tags/2.12.1",
-      "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380",
+      "TIMESCALEDB_CHECKOUT": "tags/2.12.2",
+      "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee",
       "PG_HINT_PLAN_CHECKOUT": "tags/REL14_1_4_2",
       "PG_HINT_PLAN_CHECKOUT_SHA1": "81e4f0f37966081bc1909db9796bfc1b1b5d2349",
       "POSTGIS_MAJOR": "3",
@@ -183,7 +183,7 @@
       "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1"
     },
     "bookworm": {
-      "tags": "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4 latest",
+      "tags": "15-3.4-bookworm 15-3.4.0-bookworm 15-3.4",
       "postgis": "3.4",
       "readme_group": "bookworm",
       "PG_MAJOR": "15",
@@ -194,7 +194,7 @@
       "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1"
     },
     "alpine3.18": {
-      "tags": "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine alpine",
+      "tags": "15-3.4-alpine3.18 15-3.4.0-alpine3.18 15-3.4-alpine",
       "readme_group": "alpine3.18",
       "postgis": "3.4",
       "arch": "amd64 arm64",
@@ -209,7 +209,7 @@
   },
   "15-3.4-bundle0": {
     "bookworm": {
-      "tags": "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0 bundle0",
+      "tags": "15-3.4-bundle0-bookworm 15-3.4.0-bundle0-bookworm 15-3.4-bundle0",
       "postgis": "3.4",
       "readme_group": "bundle0",
       "PG_MAJOR": "15",
@@ -222,8 +222,8 @@
       "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be",
       "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0",
       "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49",
-      "TIMESCALEDB_CHECKOUT": "tags/2.12.1",
-      "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380",
+      "TIMESCALEDB_CHECKOUT": "tags/2.12.2",
+      "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee",
       "PG_HINT_PLAN_CHECKOUT": "tags/REL15_1_5_1",
       "PG_HINT_PLAN_CHECKOUT_SHA1": "7a41e7ba94c8769895fefbb282f6943067adac2e",
       "POSTGIS_MAJOR": "3",
@@ -239,16 +239,16 @@
       "PG_DOCKER": "15",
       "arch": "amd64 arm64",
       "template": "Dockerfile.master.template",
-      "POSTGIS_CHECKOUT": "b178091a9833febf41d6d9f388804a414a26421a",
-      "POSTGIS_CHECKOUT_SHA1": "b178091a9833febf41d6d9f388804a414a26421a",
-      "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c",
-      "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c",
+      "POSTGIS_CHECKOUT": "6926524812f3f78bf570526539761f495aa4b9d2",
+      "POSTGIS_CHECKOUT_SHA1": "6926524812f3f78bf570526539761f495aa4b9d2",
+      "CGAL_CHECKOUT": "4ee9d15c9f4c544680536b7fca4c8016eb092651",
+      "CGAL_CHECKOUT_SHA1": "4ee9d15c9f4c544680536b7fca4c8016eb092651",
       "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa",
       "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa",
-      "PROJ_CHECKOUT": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4",
-      "PROJ_CHECKOUT_SHA1": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4",
-      "GDAL_CHECKOUT": "7c78481624c632a996915195b298190c23c3cc2e",
-      "GDAL_CHECKOUT_SHA1": "7c78481624c632a996915195b298190c23c3cc2e",
+      "PROJ_CHECKOUT": "e8711e659ffde7f5809538669aa0f15c88bb0665",
+      "PROJ_CHECKOUT_SHA1": "e8711e659ffde7f5809538669aa0f15c88bb0665",
+      "GDAL_CHECKOUT": "e314bd5b637fb79215890fa87b630bcf4520713a",
+      "GDAL_CHECKOUT_SHA1": "e314bd5b637fb79215890fa87b630bcf4520713a",
       "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875",
       "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875",
       "BOOST_VERSION": "1.74.0"
@@ -291,7 +291,7 @@
       "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg110+1"
     },
     "bookworm": {
-      "tags": "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4",
+      "tags": "16-3.4-bookworm 16-3.4.0-bookworm 16-3.4 latest",
       "postgis": "3.4",
       "readme_group": "bookworm",
       "PG_MAJOR": "16",
@@ -302,7 +302,7 @@
       "POSTGIS_VERSION": "3.4.0+dfsg-1.pgdg120+1"
     },
     "alpine3.18": {
-      "tags": "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine",
+      "tags": "16-3.4-alpine3.18 16-3.4.0-alpine3.18 16-3.4-alpine alpine",
       "readme_group": "alpine3.18",
       "postgis": "3.4",
       "arch": "amd64 arm64",
@@ -317,7 +317,7 @@
   },
   "16-3.4-bundle0": {
     "bookworm": {
-      "tags": "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0",
+      "tags": "16-3.4-bundle0-bookworm 16-3.4.0-bundle0-bookworm 16-3.4-bundle0 bundle0",
       "postgis": "3.4",
       "readme_group": "bundle0",
       "PG_MAJOR": "16",
@@ -330,8 +330,8 @@
       "PGSQL_HTTP_CHECKOUT_SHA1": "d0ca28df6121f10cd3868744d219904c7923c5be",
       "PGSQL_GZIP_CHECKOUT": "tags/v1.0.0",
       "PGSQL_GZIP_CHECKOUT_SHA1": "7c26e8b0056631ec0bb7c8fdd9bf2a24076e4a49",
-      "TIMESCALEDB_CHECKOUT": "tags/2.12.1",
-      "TIMESCALEDB_CHECKOUT_SHA1": "c93faddbe95e45d93a53c3f652e2033558e8b380",
+      "TIMESCALEDB_CHECKOUT": "tags/2.12.2",
+      "TIMESCALEDB_CHECKOUT_SHA1": "2a39fbb444888bbba9139c7f7ab84f2aa28509ee",
       "PG_HINT_PLAN_CHECKOUT": "tags/REL16_1_6_0",
       "PG_HINT_PLAN_CHECKOUT_SHA1": "fa0a461af929c06f7c96956369458456c26e7ad9",
       "POSTGIS_MAJOR": "3",
@@ -347,16 +347,16 @@
       "PG_DOCKER": "16",
       "arch": "amd64 arm64",
       "template": "Dockerfile.master.template",
-      "POSTGIS_CHECKOUT": "b178091a9833febf41d6d9f388804a414a26421a",
-      "POSTGIS_CHECKOUT_SHA1": "b178091a9833febf41d6d9f388804a414a26421a",
-      "CGAL_CHECKOUT": "3c8e2053721271119499506ea1d8a49dee89e30c",
-      "CGAL_CHECKOUT_SHA1": "3c8e2053721271119499506ea1d8a49dee89e30c",
+      "POSTGIS_CHECKOUT": "6926524812f3f78bf570526539761f495aa4b9d2",
+      "POSTGIS_CHECKOUT_SHA1": "6926524812f3f78bf570526539761f495aa4b9d2",
+      "CGAL_CHECKOUT": "4ee9d15c9f4c544680536b7fca4c8016eb092651",
+      "CGAL_CHECKOUT_SHA1": "4ee9d15c9f4c544680536b7fca4c8016eb092651",
       "SFCGAL_CHECKOUT": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa",
       "SFCGAL_CHECKOUT_SHA1": "34f5a2e5e91a730121128f75d2ef4b55bb8e2afa",
-      "PROJ_CHECKOUT": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4",
-      "PROJ_CHECKOUT_SHA1": "61003c9550925bcfc7c0ab37f3c64fc6c29c46a4",
-      "GDAL_CHECKOUT": "7c78481624c632a996915195b298190c23c3cc2e",
-      "GDAL_CHECKOUT_SHA1": "7c78481624c632a996915195b298190c23c3cc2e",
+      "PROJ_CHECKOUT": "e8711e659ffde7f5809538669aa0f15c88bb0665",
+      "PROJ_CHECKOUT_SHA1": "e8711e659ffde7f5809538669aa0f15c88bb0665",
+      "GDAL_CHECKOUT": "e314bd5b637fb79215890fa87b630bcf4520713a",
+      "GDAL_CHECKOUT_SHA1": "e314bd5b637fb79215890fa87b630bcf4520713a",
       "GEOS_CHECKOUT": "28d70a2e4582edcd3625659f70e31d1853423875",
       "GEOS_CHECKOUT_SHA1": "28d70a2e4582edcd3625659f70e31d1853423875",
       "BOOST_VERSION": "1.74.0"
diff --git a/versions.sh b/versions.sh
index 378e054c..65358471 100755
--- a/versions.sh
+++ b/versions.sh
@@ -23,7 +23,7 @@ debian_variants=" bullseye bookworm "
 debian_latest="bookworm"
 alpine_latest="alpine3.18"
 postgis_latest="3.4"
-postgres_latest="15"
+postgres_latest="16"
 postgis_versions="3.0 3.1 3.2 3.3 3.4"
 postgres_versions="11 12 13 14 15 16"