diff --git a/.github/workflows/extensions.yaml b/.github/workflows/extensions.yaml
index 114c1115..01a232b9 100644
--- a/.github/workflows/extensions.yaml
+++ b/.github/workflows/extensions.yaml
@@ -57,7 +57,7 @@ jobs:
       - dind
       - xlarge-16x16
     container:
-      image: quay.io/tembo/trunk-test-tembo:b472101-pg15
+      image: quay.io/tembo/trunk-test-tembo:f3b2a28-pg15
       options: --user root
     needs:
       - find_directories
@@ -83,7 +83,7 @@ jobs:
       - dind
       - xlarge-16x16
     container:
-      image: quay.io/tembo/trunk-test-tembo:b472101-pg15
+      image: quay.io/tembo/trunk-test-tembo:f3b2a28-pg15
       options: --user root
     needs:
       - find_directories
diff --git a/.github/workflows/trunk-install-test.yml b/.github/workflows/trunk-install-test.yml
index a0c85b0a..775b0bd3 100644
--- a/.github/workflows/trunk-install-test.yml
+++ b/.github/workflows/trunk-install-test.yml
@@ -18,7 +18,7 @@ jobs:
       - dind
       - large-8x8
     container:
-      image: quay.io/tembo/trunk-test-tembo:0.0.31
+      image: quay.io/tembo/trunk-test-tembo:f3b2a28-pg15
       options: --user root
     env:
       PGHOST: "localhost"
diff --git a/contrib/bool_plperl/Dockerfile b/contrib/bool_plperl/Dockerfile
index 553ec341..dcca1c6e 100644
--- a/contrib/bool_plperl/Dockerfile
+++ b/contrib/bool_plperl/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Extension build dependencies
+# Install extension build dependencies.
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \
diff --git a/contrib/bool_plperlu/Dockerfile b/contrib/bool_plperlu/Dockerfile
index 33d30a3a..44b7f157 100644
--- a/contrib/bool_plperlu/Dockerfile
+++ b/contrib/bool_plperlu/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Extension build dependencies
+# Install extension build dependencies.
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \
diff --git a/contrib/jsonb_plperl/Dockerfile b/contrib/jsonb_plperl/Dockerfile
index 3181f27a..dbc02216 100644
--- a/contrib/jsonb_plperl/Dockerfile
+++ b/contrib/jsonb_plperl/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Install extension build dependencies.
+# Install extension build dependencies
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \
diff --git a/contrib/jsonb_plperlu/Dockerfile b/contrib/jsonb_plperlu/Dockerfile
index 34b36228..855d7fb9 100644
--- a/contrib/jsonb_plperlu/Dockerfile
+++ b/contrib/jsonb_plperlu/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Install extension build dependencies.
+# Install extension build dependencies
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \
diff --git a/contrib/plperl/Dockerfile b/contrib/plperl/Dockerfile
index 6b4b55ff..e6802155 100644
--- a/contrib/plperl/Dockerfile
+++ b/contrib/plperl/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Install extension build dependencies.
+# Install extension build dependencies
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \
diff --git a/contrib/plperlu/Dockerfile b/contrib/plperlu/Dockerfile
index e21f7254..2559e17c 100644
--- a/contrib/plperlu/Dockerfile
+++ b/contrib/plperlu/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Install extension build dependencies.
+# Install extension build dependencies
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \
diff --git a/contrib/pltcl/Dockerfile b/contrib/pltcl/Dockerfile
index 0fdaca06..ce6500f0 100644
--- a/contrib/pltcl/Dockerfile
+++ b/contrib/pltcl/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Install extension build dependencies.
+# Install extension build dependencies
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \
diff --git a/contrib/pltclu/Dockerfile b/contrib/pltclu/Dockerfile
index 0fdaca06..ce6500f0 100644
--- a/contrib/pltclu/Dockerfile
+++ b/contrib/pltclu/Dockerfile
@@ -1,7 +1,7 @@
 ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Install extension build dependencies.
+# Install extension build dependencies
 USER root
 RUN apt-get update && apt-get install -y \
 	build-essential \