diff --git a/contrib/meta_triggers/Dockerfile b/contrib/meta_triggers/Dockerfile
index fac97c4d..de12ca1c 100644
--- a/contrib/meta_triggers/Dockerfile
+++ b/contrib/meta_triggers/Dockerfile
@@ -2,14 +2,11 @@
 ARG PG_VERSION=15
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/aquameta/meta_triggers.git
-
-# Set project version
-ARG RELEASE=v0.3.0
-
-# Build extension
-RUN cd meta_triggers && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/aquameta/${EXTENSION_NAME}.git \
+    && cd ${EXTENSION_NAME} \
+    # https://github.com/aquameta/meta/pull/39
+    && printf "requires = 'meta'\n" >> ${EXTENSION_NAME}.control \
+    && make
diff --git a/contrib/meta_triggers/Trunk.toml b/contrib/meta_triggers/Trunk.toml
index 2e0cd47c..9d702b6e 100644
--- a/contrib/meta_triggers/Trunk.toml
+++ b/contrib/meta_triggers/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "meta_triggers"
-version = "0.3.0"
+version = "0.4.0"
 repository = "https://github.com/aquameta/meta_triggers"
 license = "BSD-2-Clause"
 description = "PostgreSQL Extension: Insert, update and delete triggers that make the meta extension writable."
@@ -11,9 +11,4 @@ categories = ["tooling_admin"]
 postgres_version = "15"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd meta_triggers && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C meta_triggers install"
diff --git a/contrib/mysql_fdw/Dockerfile b/contrib/mysql_fdw/Dockerfile
index 3d725e4e..c14eda36 100644
--- a/contrib/mysql_fdw/Dockerfile
+++ b/contrib/mysql_fdw/Dockerfile
@@ -16,18 +16,10 @@ RUN apt-get update && apt-get install -y \
 	ccache \
 	default-libmysqlclient-dev
 
-# Clone repository
-RUN git clone https://github.com/postgres/postgres.git
-
-
-ARG PG_RELEASE=REL_15_3
-
-# Build extension
-RUN cd postgres && \
-	git fetch origin ${PG_RELEASE} && \
-	git checkout ${PG_RELEASE} && \
-	./configure && \
-	cd contrib && \
-	git clone https://github.com/EnterpriseDB/mysql_fdw.git && \
-	cd mysql_fdw && \
-	make USE_PGXS=1
+# Clone and build the extension.
+ARG EXTENSION_NAME
+# ARG EXTENSION_VERSION
+ARG RELEASE=REL-2_9_2
+RUN git clone --depth 1 --branch "${RELEASE}" https://github.com/EnterpriseDB/${EXTENSION_NAME}.git \
+    && cd ${EXTENSION_NAME} \
+	&& make USE_PGXS=1
diff --git a/contrib/mysql_fdw/Trunk.toml b/contrib/mysql_fdw/Trunk.toml
index f6e5e842..11002801 100644
--- a/contrib/mysql_fdw/Trunk.toml
+++ b/contrib/mysql_fdw/Trunk.toml
@@ -12,12 +12,7 @@ categories = ["connectors"]
 apt = ["libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd postgres/contrib/mysql_fdw && make USE_PGXS=1 install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make -C mysql_fdw install USE_PGXS=1"
diff --git a/contrib/postgis/Dockerfile b/contrib/postgis/Dockerfile
index b0ea6260..a03ae89e 100644
--- a/contrib/postgis/Dockerfile
+++ b/contrib/postgis/Dockerfile
@@ -1,16 +1,20 @@
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
+
 USER root
+RUN apt-get update && apt-get install -y \
+	libgeos-dev \
+	libproj-dev \
+	libprotobuf-c-dev \
+	protobuf-c-compiler \
+	libgdal-dev
 
-RUN apt-get update \
-	&& apt-get install -y \
-		libgeos-dev \
-		libproj-dev \
-		libprotobuf-c-dev \
-		protobuf-c-compiler \
-		libgdal-dev \
-	&& wget https://download.osgeo.org/postgis/source/postgis-3.4.0.tar.gz \
-	&& tar xvf postgis-3.4.0.tar.gz \
-	&& cd postgis-3.4.0 \
+# Extension build dependencies
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN curl -O https://download.osgeo.org/${EXTENSION_NAME}/source/${EXTENSION_NAME}-${EXTENSION_VERSION}.tar.gz \
+	&& tar xvf ${EXTENSION_NAME}-${EXTENSION_VERSION}.tar.gz \
+	&& cd ${EXTENSION_NAME}-${EXTENSION_VERSION} \
 	&& ./configure \
 	&& make
+WORKDIR /app/${EXTENSION_NAME}-${EXTENSION_VERSION}
diff --git a/contrib/postgis/Trunk.toml b/contrib/postgis/Trunk.toml
index 5db7db8c..74501604 100644
--- a/contrib/postgis/Trunk.toml
+++ b/contrib/postgis/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "postgis"
-version = "3.4.0"
+version = "3.5.0"
 repository = "https://github.com/postgis/postgis"
 license = "GPL-2.0"
 description = "PostGIS geometry and geography spatial types and functions."
@@ -12,12 +12,7 @@ categories = ["featured", "data_transformations"]
 apt = ["libjson-c5", "libgcc-s1", "libpcre2-8-0", "libstdc++6", "libproj22", "libxml2", "libgdal30", "libgeos-c1v5", "libc6", "libprotobuf-c1"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd postgis-3.4.0/ && make install
-    set -x
-    mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension
-    mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib
-    """
+install_command = "make install"