diff --git a/.github/workflows/extensions.yaml b/.github/workflows/extensions.yaml
index 4e95df11..9a5df538 100644
--- a/.github/workflows/extensions.yaml
+++ b/.github/workflows/extensions.yaml
@@ -36,7 +36,7 @@ jobs:
             changed_relative_to_ref="origin/${{ github.base_ref || 'not-a-branch' }}"
           fi
           echo "changed_relative_to_ref=${changed_relative_to_ref}" >> $GITHUB_OUTPUT
-      - name: Check out the coredb repo to reuse some actions
+      - name: Check out the repo to reuse some actions
         uses: actions/checkout@v4
         with:
           repository: tembo-io/tembo
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index e895d018..039fe21b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pg-trunk"
-version = "0.15.7"
+version = "0.15.8"
 edition = "2021"
 authors = ["Ian Stanton", "Vinícius Miguel", "David E. Wheeler"]
 description = "A package manager for PostgreSQL extensions"
diff --git a/cli/README-DEV.md b/cli/README-DEV.md
index bf3361c6..15973589 100644
--- a/cli/README-DEV.md
+++ b/cli/README-DEV.md
@@ -20,9 +20,65 @@ The `--nocapture` option ensures all output prints to the terminal. The
 `--test-threads=4` limits the number of threads so as not to overwhelm Docker
 (seems especially prone with macOS Docker's VM).
 
+## Docker Desktop
+
+Start a pgxn-tools privileged container with the repository directory mounted:
+
+```sh
+cd trunk
+docker run -it --rm -v "$PWD:/repo" --privileged --platform linux/amd64 -w /repo pgxn/pgxn-tools bash
+```
+
+Inside the container, follow the [installation instructions] to set up the Apt repo:
+
+``` sh
+# Add Docker's official GPG key:
+sudo apt-get update
+sudo apt-get install ca-certificates curl
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+```
+
+Install Docker:
+
+``` sh
+sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
+```
+
+Fix [bug] and start Docker:
+
+``` sh
+perl -i -pe 's/ulimit -Hn/ulimit -n/' /etc/init.d/docker
+systemctl start docker
+```
+
+Install and start Postgres and upgrade Rust:
+
+``` sh
+pg-start 15
+rustup update
+```
+
+Run the tests:
+
+``` sh
+cd cli
+cargo test -- --nocapture --test-threads=4
+```
+
   [Postgres]: https://www.postgresql.org
     "PostgreSQL: The World's Most Advanced Open Source Relational Database"
   [`pg_config`]: https://www.postgresql.org/docs/current/app-pgconfig.html
     "PostgreSQL Docs: pg_config"
   [Docker]: https://www.docker.com
     "Docker: Accelerated Container Application Development"
+  [installation instructions]: https://docs.docker.com/engine/install/debian/#install-using-the-repository
+  [bug]: https://forums.docker.com/t/etc-init-d-docker-62-ulimit-error-setting-limit-invalid-argument-problem/139424/2
diff --git a/cli/README.md b/cli/README.md
index 550eeff4..2a315b6c 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -106,21 +106,31 @@ Trunk can help us build and package these types of extensions as well.
 
 Create a custom Dockerfile named `Dockerfile.pg_stat_statements` at the root of the [postgres/contrib](https://github.com/postgres/postgres/tree/master/contrib)
 repository:
+
 ```dockerfile
-ARG PG_VERSION=15
+# Set up variables for build.
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
-# Postgres build dependencies. Additional system dependencies for the extension can be added here.
-# https://wiki.postgresql.org/wiki/Compile_and_Install_from_source_code
-RUN apt-get update && apt-get install -y  build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev libssl-dev libxml2-utils xsltproc ccache
-
-# Copy working directory into container
-COPY --chown=postgres:postgres . .
-# Necessary step for building extensions in postgres/contrib
-RUN ./configure
-# Run make in the pg_stat_statements directory
-RUN cd contrib/pg_stat_statements && make
+# Extension build dependencies
+USER root
+RUN apt-get update && apt-get install -y \
+	build-essential \
+	libreadline-dev \
+	zlib1g-dev \
+	flex bison \
+	libxml2-dev \
+	libxslt-dev \
+	libssl-dev \
+	libxml2-utils \
+	xsltproc \
+	ccache
+
+# Clone repository and build extension.
+ARG EXTENSION_NAME
+ARG PG_RELEASE
+RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \
+	&& make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1
 ```
 
 Run `trunk build` with `--dockerfile` and `--install-command` flags:
@@ -130,16 +140,11 @@ Run `trunk build` with `--dockerfile` and `--install-command` flags:
 --name pg_stat_statements \
 --version 1.10.0 \
 --dockerfile Dockerfile.pg_stat_statements \
---install-command \
-"cd contrib/pg_stat_statements \
-&& 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 contrib/pg_stat_statements USE_PGXS=1 install
 Building from path .
 Detected a Makefile, guessing that we are building an extension with 'make', 'make install...'
 Using Dockerfile at Dockerfile.pg_stat_statements
-Using install command /bin/sh -c cd contrib/pg_stat_statements && 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
+Using install command /bin/sh -c make -C contrib/pg_stat_statements USE_PGXS=1 install
 Building with name pg_stat_statements
 Building with version 1.10.0
 .
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index a75ac417..d8532623 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -6,11 +6,11 @@ use std::path::{Path, PathBuf};
 use std::process::Command; // Run programs
 use tempfile::TempDir;
 
-const CARGO_BIN: &str = "trunk";
+const TRUNK_BIN: &str = "trunk";
 
 #[test]
 fn help() -> Result<(), Box<dyn std::error::Error>> {
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
 
     cmd.arg("--help");
     cmd.assert().stdout(predicate::str::contains("Usage: "));
@@ -25,7 +25,7 @@ fn install_manifest_v1_extension() -> Result<(), Box<dyn std::error::Error>> {
     extension_path.pop(); // Remove the file name from the path
     extension_path.push("artifact-v1/my_extension-0.0.0.tar.gz");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -53,14 +53,14 @@ fn build_and_install_extension_with_directory_field() -> Result<(), Box<dyn std:
     // Set up a temporary directory that will be deleted when the test finishes.
     let tmp_dir = TempDir::with_prefix("test_pljava_")?;
     let output_dir = tmp_dir.path();
-    let tarball = &output_dir.join("pljava-1.6.5-pg15.tar.gz");
+    let tarball = &output_dir.join("pljava-1.6.8-pg15.tar.gz");
 
     // Construct a path relative to the current file's directory
     let mut extension_path = std::path::PathBuf::from(file!());
     extension_path.pop(); // Remove the file name from the path
     extension_path.push("test_pljava");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(extension_path.as_os_str());
@@ -75,7 +75,12 @@ fn build_and_install_extension_with_directory_field() -> Result<(), Box<dyn std:
         return Ok(());
     }
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    println!(
+        "Files in {} before install:",
+        pg_config_path("sharedir")?.join("pljava").display()
+    );
+
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -84,16 +89,38 @@ fn build_and_install_extension_with_directory_field() -> Result<(), Box<dyn std:
     cmd.arg("pljava");
     cmd.assert().code(0);
 
+    println!(
+        "trunk install output::\n{}",
+        String::from_utf8(cmd.output().unwrap().stdout).unwrap()
+    );
+
     // Get output of 'pg_config --sharedir' and '--pkgdir'
     let sharedir = pg_config_path("sharedir")?;
     let pkglibdir = pg_config_path("pkglibdir")?;
 
+    println!(
+        "Files in {} after install:",
+        sharedir.join("pljava").display()
+    );
+    match fs::read_dir(sharedir.join("pljava")) {
+        Ok(entries) => {
+            for entry in entries {
+                match entry {
+                    Ok(entry) => println!("  {:?}", entry.path()),
+                    Err(e) => eprintln!("Error: {}", e),
+                }
+            }
+        }
+        Err(e) => eprintln!("Error: {}", e),
+    }
+
     // Make sure files were installed.
     assert!(sharedir.join("pljava/pljava.control").exists());
-    assert!(sharedir.join("pljava/pljava-1.6.5.jar").exists());
-    assert!(sharedir.join("pljava/pljava-api-1.6.5.jar").exists());
-    assert!(sharedir.join("pljava/pljava--1.6.5.sql").exists());
-    assert!(pkglibdir.join("libpljava-so-1.6.5.so").exists());
+    assert!(sharedir.join("pljava/pljava-1.6.8.jar").exists());
+    assert!(sharedir.join("pljava/pljava-api-1.6.8.jar").exists());
+    assert!(sharedir.join("pljava/pljava--1.6.8.sql").exists());
+    println!("pkglibdir: {}", pkglibdir.display());
+    assert!(pkglibdir.join("libpljava-so-1.6.8.so").exists());
     Ok(())
 }
 
@@ -110,7 +137,7 @@ fn build_pgrx_extension() -> Result<(), Box<dyn std::error::Error>> {
     extension_path.pop(); // Remove the file name from the path
     extension_path.push("test_pgrx_extension");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(extension_path.as_os_str());
@@ -148,7 +175,7 @@ fn build_pgrx_extension() -> Result<(), Box<dyn std::error::Error>> {
     }
 
     // assert post installation steps contain correct CREATE EXTENSION command
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -180,7 +207,7 @@ fn build_pgrx_extension_bad_name() -> Result<(), Box<dyn std::error::Error>> {
     extension_path.pop(); // Remove the file name from the path
     extension_path.push("test_pgrx_extension");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(extension_path.as_os_str());
@@ -204,7 +231,7 @@ fn build_pgrx_extension_bad_version() -> Result<(), Box<dyn std::error::Error>>
     extension_path.pop(); // Remove the file name from the path
     extension_path.push("test_pgrx_extension");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(extension_path.as_os_str());
@@ -242,7 +269,7 @@ fn build_c_extension() -> Result<(), Box<dyn std::error::Error>> {
     }
     .expect("Failed to set HEAD");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(repo_dir);
@@ -289,35 +316,21 @@ fn build_extension_custom_dockerfile() -> Result<(), Box<dyn std::error::Error>>
     let manifest_file = &output_dir.join("manifest.json");
 
     // Example of a C extension requires another build-time requirement
-    let repo_url = "https://github.com/pramsey/pgsql-http.git";
-    // clone and checkout ref v1.5.0
-    let repo_dir = &output_dir.join("pgsql-http");
-    let repo = Repository::clone(repo_url, repo_dir).unwrap();
-    let refname = "v1.5.0";
-    let (object, reference) = repo.revparse_ext(refname).expect("Object not found");
-    repo.checkout_tree(&object, None)
-        .expect("Failed to checkout");
-    match reference {
-        // gref is an actual reference like branches or tags
-        Some(gref) => repo.set_head(gref.name().unwrap()),
-        // this is a commit, not a reference
-        None => repo.set_head_detached(object.id()),
-    }
-    .expect("Failed to set HEAD");
-
     let mut dockerfile_path = std::path::PathBuf::from(file!());
     dockerfile_path.pop(); // Remove the file name from the path
     dockerfile_path.push("test_builders");
     dockerfile_path.push("Dockerfile.http");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
-    cmd.arg(repo_dir);
+    cmd.arg(output_dir);
     cmd.arg("--output-path");
     cmd.arg(output_dir);
     cmd.arg("--dockerfile");
     cmd.arg(dockerfile_path.clone());
+    cmd.arg("--install-command");
+    cmd.arg("make -C pgsql-http install");
     cmd.arg("--version");
     cmd.arg("1.5.0");
     cmd.arg("--name");
@@ -356,7 +369,7 @@ fn build_extension_custom_dockerfile() -> Result<(), Box<dyn std::error::Error>>
     }
 
     // assert post installation steps contain correct CREATE EXTENSION command
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -381,37 +394,21 @@ fn build_pg_stat_statements() -> Result<(), Box<dyn std::error::Error>> {
     let manifest_file = &output_dir.join("manifest.json");
 
     // Example of a C extension requires another build-time requirement
-    // clone and checkout postgres REL_15_3
-    let repo_url = "https://github.com/postgres/postgres.git";
-    let repo_dir = &output_dir.join("postgres_pg_stat_statements");
-    let repo = Repository::clone(repo_url, repo_dir).unwrap();
-    let refname = "REL_15_3";
-    let (object, reference) = repo.revparse_ext(refname).expect("Object not found");
-    repo.checkout_tree(&object, None)
-        .expect("Failed to checkout");
-    match reference {
-        // gref is an actual reference like branches or tags
-        Some(gref) => repo.set_head(gref.name().unwrap()),
-        // this is a commit, not a reference
-        None => repo.set_head_detached(object.id()),
-    }
-    .expect("Failed to set HEAD");
-
     let mut dockerfile_path = std::path::PathBuf::from(file!());
     dockerfile_path.pop(); // Remove the file name from the path
     dockerfile_path.push("test_builders");
     dockerfile_path.push("Dockerfile.pg_stat_statements");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
-    cmd.arg(repo_dir);
+    cmd.arg(output_dir);
     cmd.arg("--output-path");
     cmd.arg(output_dir);
     cmd.arg("--dockerfile");
     cmd.arg(dockerfile_path.clone());
     cmd.arg("--install-command");
-    cmd.arg("cd contrib/pg_stat_statements && 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");
+    cmd.arg("make -C postgres/contrib/pg_stat_statements USE_PGXS=1 install");
     cmd.arg("--version");
     cmd.arg("1.10");
     cmd.arg("--name");
@@ -449,7 +446,7 @@ fn build_pg_cron_trunk_toml() -> Result<(), Box<dyn std::error::Error>> {
     // Set up a temporary directory that will be deleted when the test finishes.
     let tmp_dir = TempDir::with_prefix("test_pg_cron_trunk_toml_")?;
     let output_dir = tmp_dir.path();
-    let tarball = &output_dir.join("pg_cron-1.5.2-pg15.tar.gz");
+    let tarball = &output_dir.join("pg_cron-1.6.4-pg15.tar.gz");
     let manifest_file = &output_dir.join("manifest.json");
 
     // Construct a path relative to the current file's directory
@@ -458,7 +455,7 @@ fn build_pg_cron_trunk_toml() -> Result<(), Box<dyn std::error::Error>> {
     trunkfile_path.push("test_trunk_toml_dirs");
     trunkfile_path.push("pg_cron");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(trunkfile_path.as_os_str());
@@ -508,7 +505,7 @@ fn build_pg_cron_trunk_toml() -> Result<(), Box<dyn std::error::Error>> {
     }
 
     // assert post installation steps contain correct CREATE EXTENSION command
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -550,7 +547,7 @@ fn build_pgrx_with_trunk_toml() -> Result<(), Box<dyn std::error::Error>> {
     trunkfile_path.push("test_trunk_toml_dirs");
     trunkfile_path.push("pgrx_with_trunk_toml");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(trunkfile_path.as_os_str());
@@ -591,7 +588,7 @@ fn build_pgrx_with_trunk_toml() -> Result<(), Box<dyn std::error::Error>> {
         return Ok(());
     }
     // assert post installation steps contain correct CREATE EXTENSION command
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -629,7 +626,7 @@ fn build_pgrx_with_trunk_toml_bad_name() -> Result<(), Box<dyn std::error::Error
     trunkfile_path.push("test_trunk_toml_dirs");
     trunkfile_path.push("pgrx_with_trunk_toml_bad_name");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(trunkfile_path.as_os_str());
@@ -651,7 +648,7 @@ fn build_pgrx_with_trunk_toml_bad_version() -> Result<(), Box<dyn std::error::Er
     trunkfile_path.push("test_trunk_toml_dirs");
     trunkfile_path.push("pgrx_with_trunk_toml_bad_version");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(trunkfile_path.as_os_str());
@@ -672,36 +669,21 @@ fn build_auto_explain() -> Result<(), Box<dyn std::error::Error>> {
     let manifest_file = &output_dir.join("manifest.json");
 
     // Example of a C extension requires another build-time requirement
-    let repo_url = "https://github.com/postgres/postgres.git";
-    let repo_dir = &output_dir.join("postgres");
-    let repo = Repository::clone(repo_url, repo_dir).unwrap();
-    let refname = "REL_15_3";
-    let (object, reference) = repo.revparse_ext(refname).expect("Object not found");
-    repo.checkout_tree(&object, None)
-        .expect("Failed to checkout");
-    match reference {
-        // gref is an actual reference like branches or tags
-        Some(gref) => repo.set_head(gref.name().unwrap()),
-        // this is a commit, not a reference
-        None => repo.set_head_detached(object.id()),
-    }
-    .expect("Failed to set HEAD");
-
     let mut dockerfile_path = std::path::PathBuf::from(file!());
     dockerfile_path.pop(); // Remove the file name from the path
     dockerfile_path.push("test_builders");
     dockerfile_path.push("Dockerfile.auto_explain");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
-    cmd.arg(repo_dir);
+    cmd.arg(output_dir);
     cmd.arg("--output-path");
     cmd.arg(output_dir);
     cmd.arg("--dockerfile");
     cmd.arg(dockerfile_path.clone());
     cmd.arg("--install-command");
-    cmd.arg("cd contrib/auto_explain && 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");
+    cmd.arg("make -C postgres/contrib/auto_explain install USE_PGXS=1");
     cmd.arg("--version");
     cmd.arg("15.3.0");
     cmd.arg("--name");
@@ -738,7 +720,7 @@ fn build_auto_explain() -> Result<(), Box<dyn std::error::Error>> {
         return Ok(());
     }
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -756,14 +738,14 @@ fn build_pg_unit() -> Result<(), Box<dyn std::error::Error>> {
     // Set up a temporary directory that will be deleted when the test finishes.
     let tmp_dir = TempDir::with_prefix("test_pg_unit_")?;
     let output_dir = tmp_dir.path();
-    let tarball = &output_dir.join("postgresql_unit-7.0.0-pg15.tar.gz");
+    let tarball = &output_dir.join("postgresql_unit-7.10.0-pg15.tar.gz");
 
     // Construct a path relative to the current file's directory
     let mut extension_path = std::path::PathBuf::from(file!());
     extension_path.pop(); // Remove the file name from the path
     extension_path.push("test_postgresql_unit");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(extension_path.as_os_str());
@@ -799,7 +781,7 @@ fn build_install_postgis() -> Result<(), Box<dyn std::error::Error>> {
     trunkfile_path.push("test_trunk_toml_dirs");
     trunkfile_path.push("postgis");
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("build");
     cmd.arg("--path");
     cmd.arg(trunkfile_path.as_os_str());
@@ -823,7 +805,7 @@ fn build_install_postgis() -> Result<(), Box<dyn std::error::Error>> {
 
     // Assert we recognize fuzzystrmatch as a dependency and install it
     // This is a dependency of postgis_tiger_geocoder, which is included in the postgis tar.gz
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
@@ -866,7 +848,7 @@ fn install_extension_dependency_resolution() -> Result<(), Box<dyn std::error::E
         fs::remove_file(&pgvector_so)?;
     }
 
-    let mut cmd = Command::cargo_bin(CARGO_BIN)?;
+    let mut cmd = Command::cargo_bin(TRUNK_BIN)?;
     cmd.arg("install");
     cmd.arg("--pg-version");
     cmd.arg("15");
diff --git a/cli/tests/test_builders/Dockerfile.auto_explain b/cli/tests/test_builders/Dockerfile.auto_explain
index 1fab2472..c3245aca 100644
--- a/cli/tests/test_builders/Dockerfile.auto_explain
+++ b/cli/tests/test_builders/Dockerfile.auto_explain
@@ -1,15 +1,13 @@
-ARG PG_VERSION=15
-
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-ARG PG_VERSION=15
-
-USER root
-
 # Postgres build dependencies
 # https://wiki.postgresql.org/wiki/Compile_and_Install_from_source_code
+USER root
 RUN apt-get update && apt-get install -y  build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev libssl-dev libxml2-utils xsltproc ccache
 
-COPY --chown=postgres:postgres . .
-RUN ./configure
-RUN cd contrib/auto_explain && make
+# Clone repository and build extension.
+ARG EXTENSION_NAME
+ARG PG_RELEASE
+RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \
+	&& make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1
diff --git a/cli/tests/test_builders/Dockerfile.http b/cli/tests/test_builders/Dockerfile.http
index cb060478..c4edf7c1 100644
--- a/cli/tests/test_builders/Dockerfile.http
+++ b/cli/tests/test_builders/Dockerfile.http
@@ -1,10 +1,12 @@
-FROM quay.io/coredb/c-builder:pg15
-
-COPY --chown=postgres:postgres . .
-
-USER root
+ARG PG_VERSION
+FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
 # this is the extra library we need to build pgsql-http
+USER root
 RUN apt-get update && apt-get install -y libcurl4-openssl-dev
 
-RUN make
+# Clone and build the extension.
+# ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/pramsey/pgsql-http.git \
+    && make -C pgsql-http
diff --git a/cli/tests/test_builders/Dockerfile.pg_stat_statements b/cli/tests/test_builders/Dockerfile.pg_stat_statements
index a91141e4..c3245aca 100644
--- a/cli/tests/test_builders/Dockerfile.pg_stat_statements
+++ b/cli/tests/test_builders/Dockerfile.pg_stat_statements
@@ -1,15 +1,13 @@
-ARG PG_VERSION=15
-
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-ARG PG_VERSION=15
-
-USER root
-
 # Postgres build dependencies
 # https://wiki.postgresql.org/wiki/Compile_and_Install_from_source_code
+USER root
 RUN apt-get update && apt-get install -y  build-essential libreadline-dev zlib1g-dev flex bison libxml2-dev libxslt-dev libssl-dev libxml2-utils xsltproc ccache
 
-COPY --chown=postgres:postgres . .
-RUN ./configure
-RUN cd contrib/pg_stat_statements && make
+# Clone repository and build extension.
+ARG EXTENSION_NAME
+ARG PG_RELEASE
+RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \
+	&& make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1
diff --git a/cli/tests/test_pljava/Dockerfile b/cli/tests/test_pljava/Dockerfile
index 6e80ecfe..92e7310d 100644
--- a/cli/tests/test_pljava/Dockerfile
+++ b/cli/tests/test_pljava/Dockerfile
@@ -1,5 +1,5 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 USER root
 
@@ -10,14 +10,9 @@ RUN apt-get update && apt-get install -y \
     libkrb5-dev \
     libecpg-dev
 
-# Clone repository
-RUN git clone https://github.com/tada/pljava.git
-
-# Set project version
-ARG RELEASE=V1_6_5
-
-# Build extension
-RUN cd pljava && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    mvn clean install
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "V$(perl -E 'print shift =~ s/\./_/gr' "${EXTENSION_VERSION}")" https://github.com/tada/${EXTENSION_NAME}.git \
+	&& cd ${EXTENSION_NAME} \
+    && mvn clean install
diff --git a/cli/tests/test_pljava/Trunk.toml b/cli/tests/test_pljava/Trunk.toml
index 24f6e860..3711aea9 100644
--- a/cli/tests/test_pljava/Trunk.toml
+++ b/cli/tests/test_pljava/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "pljava"
-version = "1.6.5"
+version = "1.6.8"
 repository = "https://github.com/tada/pljava"
 license = "BSD-3-Clause"
 description = "Java Procedural Language for PostgreSQL"
@@ -11,19 +11,8 @@ categories = ["procedural_languages"]
 apt = ["libc6", "openjdk-11-jdk"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 include = ["*.jar"]
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    mkdir /app/pljava/pljava-packaging/target/unpacked
-    cd /app/pljava/pljava-packaging/target/unpacked
-    jar -xf /app/pljava/pljava-packaging/target/pljava-pg15.jar
-    set -x
-    mv /app/pljava/pljava-packaging/target/unpacked/pljava/sharedir/pljava/* /usr/share/postgresql/15/extension
-    mv /app/pljava/pljava-packaging/target/unpacked/pljava/sharedir/extension/* /usr/share/postgresql/15/extension
-    mv /app/pljava/pljava-so/target/pljava-pgxs/* /usr/lib/postgresql/15/lib
-    """
-
-
-
+install_command = "java -jar pljava/pljava-packaging/target/pljava-pg17.jar"
diff --git a/cli/tests/test_postgresql_unit/Dockerfile b/cli/tests/test_postgresql_unit/Dockerfile
index ce8492f3..06216bce 100644
--- a/cli/tests/test_postgresql_unit/Dockerfile
+++ b/cli/tests/test_postgresql_unit/Dockerfile
@@ -1,12 +1,13 @@
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/df7cb/postgresql-unit.git
-
-ARG RELEASE=7.7
-
-RUN cd postgresql-unit && \
-    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 "$(perl -E 'print shift =~ s/[.]0$//gr' "${EXTENSION_VERSION}")" https://github.com/df7cb/postgresql-unit.git \
+    # Build .sql files to point to the Tembo image share directory before
+    # building everything else. Forces these lines to have the values we need:
+    # https://github.com/df7cb/postgresql-unit/blob/7.10/Makefile#L44-L45
+    && make -C postgresql-unit datadir=/var/lib/postgresql/data/tembo *.sql \
+    # Build everything else as usual.
+    && make -C postgresql-unit
diff --git a/cli/tests/test_postgresql_unit/Trunk.toml b/cli/tests/test_postgresql_unit/Trunk.toml
index 7d2c5496..8251299d 100644
--- a/cli/tests/test_postgresql_unit/Trunk.toml
+++ b/cli/tests/test_postgresql_unit/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "postgresql_unit"
-version = "7.0.0"
+version = "7.10.0"
 repository = "https://github.com/df7cb/postgresql-unit"
 license = "Copyright"
 description = "SI Units for PostgreSQL."
@@ -11,13 +11,9 @@ categories = ["analytics"]
 apt = ["libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
+install_command = "make -C postgresql-unit install"
+# Tell trunk to include unit_prefixes.data and unit_units.data.
 include = ["*.data"]
-install_command = """
-    cd postgresql-unit && 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
-    """
diff --git a/cli/tests/test_trunk_toml_dirs/pg_cron/Dockerfile b/cli/tests/test_trunk_toml_dirs/pg_cron/Dockerfile
index 47f6256e..c4c6a125 100644
--- a/cli/tests/test_trunk_toml_dirs/pg_cron/Dockerfile
+++ b/cli/tests/test_trunk_toml_dirs/pg_cron/Dockerfile
@@ -1,9 +1,8 @@
-FROM quay.io/coredb/c-builder:pg15
+ARG PG_VERSION
+FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-ARG VERSION=1.5.2
-
-RUN git clone https://github.com/citusdata/pg_cron.git
-RUN cd pg_cron && \
-  git fetch origin v${VERSION} && \
-  git checkout v${VERSION} && \
-  make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/citusdata/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}
diff --git a/cli/tests/test_trunk_toml_dirs/pg_cron/Trunk.toml b/cli/tests/test_trunk_toml_dirs/pg_cron/Trunk.toml
index 70e33282..da2152b7 100644
--- a/cli/tests/test_trunk_toml_dirs/pg_cron/Trunk.toml
+++ b/cli/tests/test_trunk_toml_dirs/pg_cron/Trunk.toml
@@ -2,7 +2,7 @@
 name = "pg_cron"
 extension_name = "extension_name_from_toml"
 extension_dependencies = ["btree_gin"]
-version = "1.5.2"
+version = "1.6.4"
 repository = "https://github.com/tembo-io/trunk"
 license = "PostgreSQL"
 categories = []
@@ -18,7 +18,7 @@ configurations = [
 
 [build]
 dockerfile = "Dockerfile"
-install_command = "cd pg_cron && make install"
+install_command = "make -C pg_cron install"
 platform = "linux/amd64"
 
 [dependencies]
diff --git a/cli/tests/test_trunk_toml_dirs/postgis/Trunk.toml b/cli/tests/test_trunk_toml_dirs/postgis/Trunk.toml
index b883cfc1..be5ebef7 100644
--- a/cli/tests/test_trunk_toml_dirs/postgis/Trunk.toml
+++ b/cli/tests/test_trunk_toml_dirs/postgis/Trunk.toml
@@ -16,9 +16,4 @@ postgres_version = "15"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
 #include = ["/app/postgis-3.so"]
-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
-    """
\ No newline at end of file
+install_command = "make -C postgis-3.4.0 install"
diff --git a/contrib/clickhouse_fdw/Dockerfile b/contrib/clickhouse_fdw/Dockerfile
index 56091010..dd217b8d 100644
--- a/contrib/clickhouse_fdw/Dockerfile
+++ b/contrib/clickhouse_fdw/Dockerfile
@@ -1,25 +1,17 @@
 # Set PostgreSQL version
-ARG PG_VERSION=17
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
 # Extension build dependencies
+USER root
 RUN apt-get update && apt-get install -y \
     cmake \
     libcurl4-openssl-dev \
     uuid-dev
 
-# Clone repository
-RUN git clone https://github.com/ildus/clickhouse_fdw.git
-
-# Set project version
-ARG RELEASE=1.4.0
-
-# Build extension
-RUN cd clickhouse_fdw && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    mkdir build && \
-    cd build && \
-    cmake .. && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "${EXTENSION_VERSION}" https://github.com/ildus/${EXTENSION_NAME}.git \
+    && cmake -S ${EXTENSION_NAME} -B ${EXTENSION_NAME}/build \
+    && make -C ${EXTENSION_NAME}/build -j8
diff --git a/contrib/clickhouse_fdw/Trunk.toml b/contrib/clickhouse_fdw/Trunk.toml
index be8dd458..3d84e6be 100644
--- a/contrib/clickhouse_fdw/Trunk.toml
+++ b/contrib/clickhouse_fdw/Trunk.toml
@@ -14,4 +14,4 @@ apt = ["libstdc++6", "libc6", "libgcc-s1"," libuuid1", "libcurl4"]
 postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = "cd clickhouse_fdw/build && make install"
+install_command = "make -C clickhouse_fdw/build install"
diff --git a/contrib/mobilitydb/Dockerfile b/contrib/mobilitydb/Dockerfile
index 66b333d7..5c7af12e 100644
--- a/contrib/mobilitydb/Dockerfile
+++ b/contrib/mobilitydb/Dockerfile
@@ -22,7 +22,5 @@ ARG EXTENSION_NAME
 ARG EXTENSION_VERSION
 RUN trunk install postgis \
     && git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/${EXTENSION_NAME}/${EXTENSION_NAME}.git \
-    && mkdir -p ${EXTENSION_NAME}/build \
-    && cd ${EXTENSION_NAME}/build \
-    && cmake .. \
-    && make
+    && cmake -S ${EXTENSION_NAME} -B ${EXTENSION_NAME}/build \
+    && make -C ${EXTENSION_NAME}/build -j8
diff --git a/contrib/pgrouting/Dockerfile b/contrib/pgrouting/Dockerfile
index b9a1ac19..94871405 100644
--- a/contrib/pgrouting/Dockerfile
+++ b/contrib/pgrouting/Dockerfile
@@ -13,7 +13,5 @@ RUN apt-get update && apt-get install -y \
 ARG EXTENSION_NAME
 ARG EXTENSION_VERSION
 RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/${EXTENSION_NAME}/${EXTENSION_NAME}.git \
-    && mkdir -p ${EXTENSION_NAME}/build  \
-    && cd ${EXTENSION_NAME}/build  \
-    && cmake .. \
-    && make
+    && cmake -S ${EXTENSION_NAME} -B ${EXTENSION_NAME}/build \
+    && make -C ${EXTENSION_NAME}/build -j8
diff --git a/contrib/pgrouting/Trunk.toml b/contrib/pgrouting/Trunk.toml
index 56f808d5..7d0a60ea 100644
--- a/contrib/pgrouting/Trunk.toml
+++ b/contrib/pgrouting/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "pgrouting"
-version = "3.7.0"
+version = "3.7.1"
 repository = "https://github.com/pgRouting/pgrouting"
 license = "GPL-2.0"
 description = "pgRouting extends the PostGIS / PostgreSQL geospatial database to provide geospatial routing functionality."
diff --git a/contrib/pljava/Trunk.toml b/contrib/pljava/Trunk.toml
index 9d0f189c..2b47a15d 100644
--- a/contrib/pljava/Trunk.toml
+++ b/contrib/pljava/Trunk.toml
@@ -8,10 +8,11 @@ documentation = "https://tada.github.io/pljava/"
 categories = ["procedural_languages"]
 
 [dependencies]
-apt = ["libc6"]
+apt = ["libc6", "openjdk-11-jdk"]
 
 [build]
 postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
 install_command = "java -jar pljava/pljava-packaging/target/pljava-pg17.jar"
+include = ["*.jar"]
diff --git a/contrib/rdkit/Dockerfile b/contrib/rdkit/Dockerfile
index e6c0e869..8d2b3b4c 100644
--- a/contrib/rdkit/Dockerfile
+++ b/contrib/rdkit/Dockerfile
@@ -1,36 +1,36 @@
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
+USER root
 RUN apt-get update && apt-get install -y \
- build-essential \
- libreadline-dev \
- zlib1g-dev \
- flex \
- bison \
- libxml2-dev \
- libxslt-dev \
- libssl-dev \
- libxml2-utils \
- xsltproc \
- ccache \
- cmake \
- gcc \
- libboost-all-dev \
- libfreetype6-dev \
- postgresql-server-dev-all
-
-ARG RELEASE=Release_2023_03_2
-ARG RDBASE=rdkit-${RELEASE}
+    build-essential \
+    libreadline-dev \
+    zlib1g-dev \
+    flex \
+    bison \
+    libxml2-dev \
+    libxslt-dev \
+    libssl-dev \
+    libxml2-utils \
+    xsltproc \
+    ccache \
+    cmake \
+    gcc \
+    libboost-all-dev \
+    libfreetype6-dev
 
 # Build and Install RDKit
-RUN wget https://github.com/rdkit/rdkit/archive/${RELEASE}.tar.gz && \
-    tar xvf ${RELEASE}.tar.gz && \
-    cd ${RDBASE} && \
-    mkdir build && \
-    cd build && \
-    cmake -DRDK_BUILD_PGSQL=ON \
-    -DRDK_BUILD_PYTHON_WRAPPERS=OFF \
-    -DRDK_BUILD_CPP_TESTS=OFF \
-    -DPostgreSQL_CONFIG_DIR=/usr/bin .. && \
-    make -j8
+ARG EXTENSION_NAME
+# ARG EXTENSION_VERSION
+ARG RELEASE=Release_2024_09_4
+RUN curl -LO https://github.com/${EXTENSION_NAME}/${EXTENSION_NAME}/archive/${RELEASE}.tar.gz \
+    && tar xvf ${RELEASE}.tar.gz \
+    && cd ${EXTENSION_NAME}-${RELEASE} \
+    && cmake -B build \
+        -D RDK_BUILD_PGSQL=ON \
+        -D RDK_BUILD_PYTHON_WRAPPERS=OFF \
+        -D PostgreSQL_CONFIG_DIR=/usr/bin \
+        -D "PostgreSQL_INCLUDE_DIR=$(pg_config --includedir)" \
+        -D "PostgreSQL_TYPE_INCLUDE_DIR=$(pg_config --includedir-server)" \
+    && make -j8 -C build
+WORKDIR /app/${EXTENSION_NAME}-${RELEASE}
diff --git a/contrib/rdkit/Trunk.toml b/contrib/rdkit/Trunk.toml
index 8bea7caf..0ecff2ac 100644
--- a/contrib/rdkit/Trunk.toml
+++ b/contrib/rdkit/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "rdkit"
-version = "4.3.0"
+version = "4.6.1"
 repository = "https://github.com/rdkit/rdkit/tree/master/Code/PgSQL/rdkit"
 license = "BSD-3-Clause"
 description = "Cheminformatics functionality for PostgreSQL."
@@ -12,10 +12,7 @@ categories = ["data_transformations"]
 apt = ["libfreetype6", "libboost-serialization1.74.0", "libc6", "libstdc++6", "libgcc-s1"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    sh rdkit-Release_2023_03_2/build/Code/PgSQL/rdkit/pgsql_install.sh
-    """
-
+install_command = "make -C build install"