diff --git a/.github/workflows/build-php-images.yml b/.github/workflows/build-php-images.yml
index c9a6eb4..89f2aeb 100644
--- a/.github/workflows/build-php-images.yml
+++ b/.github/workflows/build-php-images.yml
@@ -23,76 +23,76 @@ jobs:
       matrix:
         include:
           - image: php
-            tag: 8.5-fpm-5
+            tag: 8.5-fpm-6
             context: images/8.5-fpm
           - image: php
-            tag: 8.5-apache-5
+            tag: 8.5-apache-6
             context: images/8.5-apache
           - image: php
-            tag: 8.4-fpm-5
+            tag: 8.4-fpm-6
             context: images/8.4-fpm
           - image: php
-            tag: 8.4-apache-5
+            tag: 8.4-apache-6
             context: images/8.4-apache
           - image: php
-            tag: 8.3-fpm-5
+            tag: 8.3-fpm-6
             context: images/8.3-fpm
           - image: php
-            tag: 8.3-apache-5
+            tag: 8.3-apache-6
             context: images/8.3-apache
           - image: php
-            tag: 8.2-fpm-5
+            tag: 8.2-fpm-6
             context: images/8.2-fpm
           - image: php
-            tag: 8.2-apache-5
+            tag: 8.2-apache-6
             context: images/8.2-apache
           - image: php
-            tag: 8.1-fpm-5
+            tag: 8.1-fpm-6
             context: images/8.1-fpm
           - image: php
-            tag: 8.1-apache-5
+            tag: 8.1-apache-6
             context: images/8.1-apache
           - image: php
-            tag: 8.0-fpm-5
+            tag: 8.0-fpm-6
             context: images/8.0-fpm
           - image: php
-            tag: 8.0-apache-5
+            tag: 8.0-apache-6
             context: images/8.0-apache
           - image: php
-            tag: 7.4-fpm-5
+            tag: 7.4-fpm-6
             context: images/7.4-fpm
           - image: php
-            tag: 7.4-apache-5
+            tag: 7.4-apache-6
             context: images/7.4-apache
           - image: php
-            tag: 7.3-fpm-5
+            tag: 7.3-fpm-6
             context: images/7.3-fpm
           - image: php
-            tag: 7.3-apache-5
+            tag: 7.3-apache-6
             context: images/7.3-apache
           - image: php
-            tag: 7.2-fpm-5
+            tag: 7.2-fpm-6
             context: images/7.2-fpm
           - image: php
-            tag: 7.2-apache-5
+            tag: 7.2-apache-6
             context: images/7.2-apache
           - image: php
-            tag: 7.1-fpm-5
+            tag: 7.1-fpm-6
             context: images/7.1-fpm
           - image: php
-            tag: 7.1-apache-5
+            tag: 7.1-apache-6
             context: images/7.1-apache
           - image: php
-            tag: 7.0-fpm-5
+            tag: 7.0-fpm-6
             context: images/7.0-fpm
           - image: php
-            tag: 7.0-apache-5
+            tag: 7.0-apache-6
             context: images/7.0-apache
           - image: php
-            tag: 5.6-fpm-5
+            tag: 5.6-fpm-6
             context: images/5.6-fpm
           - image: php
-            tag: 5.6-apache-5
+            tag: 5.6-apache-6
             context: images/5.6-apache
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23f3e8d..3fc235b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
 
 * Added support for PHP 8.5
+* Added Debian 13 (trixie) base images for PHP 8.3-8.5
+* Changed PHP 7.4 and 8.0 images to use MariaDB `archive.mariadb.org` apt repository
+* Fixed expired keys preventing stretch-based images from building
 
 ## v1.8.0 - [September 2, 2025](https://github.com/lando/php/releases/tag/v1.8.0)
 
diff --git a/builders/php.js b/builders/php.js
index f79ef6e..7c43a6c 100644
--- a/builders/php.js
+++ b/builders/php.js
@@ -163,7 +163,7 @@ module.exports = {
     },
     scriptsDir: path.resolve(__dirname, '..', 'scripts'),
     sources: [],
-    suffix: '5',
+    suffix: '6',
     ssl: false,
     via: 'apache',
     volumes: ['/usr/local/bin'],
diff --git a/images/5.6-apache/Dockerfile b/images/5.6-apache/Dockerfile
index 9a6516a..a0d3c54 100644
--- a/images/5.6-apache/Dockerfile
+++ b/images/5.6-apache/Dockerfile
@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:5.6-apache-5 .
+# docker build -t devwithlando/php:5.6-apache-6 .
 
 FROM php:5.6-apache-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \
diff --git a/images/5.6-fpm/Dockerfile b/images/5.6-fpm/Dockerfile
index 412c0fa..56ca53a 100644
--- a/images/5.6-fpm/Dockerfile
+++ b/images/5.6-fpm/Dockerfile
@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:5.6-fpm-5 .
+# docker build -t devwithlando/php:5.6-fpm-6 .
 
 FROM php:5.6-fpm-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \
diff --git a/images/7.0-apache/Dockerfile b/images/7.0-apache/Dockerfile
index bb96884..e152eff 100644
--- a/images/7.0-apache/Dockerfile
+++ b/images/7.0-apache/Dockerfile
@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:7.0-apache-5 .
+# docker build -t devwithlando/php:7.0-apache-6 .
 
 FROM php:7.0-apache-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \
diff --git a/images/7.0-fpm/Dockerfile b/images/7.0-fpm/Dockerfile
index 4ed89d1..2a540cb 100644
--- a/images/7.0-fpm/Dockerfile
+++ b/images/7.0-fpm/Dockerfile
@@ -1,15 +1,20 @@
-# docker build -t devwithlando/php:7.0-fpm-5 .
+# docker build -t devwithlando/php:7.0-fpm-6 .
 
 FROM php:7.0-fpm-stretch
 
-# Install dependencies we need
+# Debian Stretch has archived repositories and expired keys
 RUN \
   sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \
   && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
   && sed -i '/stretch-updates/d' /etc/apt/sources.list \
   && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \
-  && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
-  && apt -y update && apt-get install -y \
+  && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring
+
+# Install dependencies
+RUN \
+  mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
+  && apt-get update && apt-get install -y \
     gnupg2 \
     wget \
     bzip2 \
diff --git a/images/7.1-apache/Dockerfile b/images/7.1-apache/Dockerfile
index 1f6eedf..3590ff4 100644
--- a/images/7.1-apache/Dockerfile
+++ b/images/7.1-apache/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-apache-5 .
+# docker build -t devwithlando/php:7.1-apache-6 .
 
 FROM php:7.1-apache-buster
 
diff --git a/images/7.1-fpm/Dockerfile b/images/7.1-fpm/Dockerfile
index d015777..97d16f7 100644
--- a/images/7.1-fpm/Dockerfile
+++ b/images/7.1-fpm/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.1-fpm-5 .
+# docker build -t devwithlando/php:7.1-fpm-6 .
 
 FROM php:7.1-fpm-buster
 
diff --git a/images/7.2-apache/Dockerfile b/images/7.2-apache/Dockerfile
index e30bd8e..0d6b246 100644
--- a/images/7.2-apache/Dockerfile
+++ b/images/7.2-apache/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-apache-5 .
+# docker build -t devwithlando/php:7.2-apache-6 .
 
 FROM php:7.2-apache-buster
 
diff --git a/images/7.2-fpm/Dockerfile b/images/7.2-fpm/Dockerfile
index b6338c8..f9e0fdd 100644
--- a/images/7.2-fpm/Dockerfile
+++ b/images/7.2-fpm/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.2-fpm-5 .
+# docker build -t devwithlando/php:7.2-fpm-6 .
 
 FROM php:7.2-fpm-buster
 
diff --git a/images/7.3-apache/Dockerfile b/images/7.3-apache/Dockerfile
index add1cb5..8324505 100644
--- a/images/7.3-apache/Dockerfile
+++ b/images/7.3-apache/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-apache-5 .
+# docker build -t devwithlando/php:7.3-apache-6 .
 
 FROM php:7.3-apache-bullseye
 
diff --git a/images/7.3-fpm/Dockerfile b/images/7.3-fpm/Dockerfile
index ced55e9..6a89972 100644
--- a/images/7.3-fpm/Dockerfile
+++ b/images/7.3-fpm/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.3-fpm-5 .
+# docker build -t devwithlando/php:7.3-fpm-6 .
 
 FROM php:7.3-fpm-bullseye
 
diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile
index 47b27f4..7dfd782 100644
--- a/images/7.4-apache/Dockerfile
+++ b/images/7.4-apache/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-apache-5 .
+# docker build -t devwithlando/php:7.4-apache-6 .
 
 FROM php:7.4-apache-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile
index 7a6d281..6c949e1 100644
--- a/images/7.4-fpm/Dockerfile
+++ b/images/7.4-fpm/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:7.4-fpm-5 .
+# docker build -t devwithlando/php:7.4-fpm-6 .
 
 FROM php:7.4-fpm-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile
index 32368e3..ad23aae 100644
--- a/images/8.0-apache/Dockerfile
+++ b/images/8.0-apache/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-apache-5 .
+# docker build -t devwithlando/php:8.0-apache-6 .
 
 FROM php:8.0-apache-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile
index 63456c9..c0dc873 100644
--- a/images/8.0-fpm/Dockerfile
+++ b/images/8.0-fpm/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.0-fpm-5 .
+# docker build -t devwithlando/php:8.0-fpm-6 .
 
 FROM php:8.0-fpm-bullseye
 
@@ -8,7 +8,7 @@ RUN \
   # MariaDB client compatibility (https://github.com/lando/php/issues/120)
   mkdir -p /etc/apt/keyrings \
   && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
+  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list
 
 RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile
index ff0108b..3c82274 100644
--- a/images/8.1-apache/Dockerfile
+++ b/images/8.1-apache/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.1-apache-5 .
+# docker build -t devwithlando/php:8.1-apache-6 .
 
 FROM php:8.1-apache-bookworm
 
diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile
index b420667..597c86b 100644
--- a/images/8.1-fpm/Dockerfile
+++ b/images/8.1-fpm/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.1-fpm-5 .
+# docker build -t devwithlando/php:8.1-fpm-6 .
 
 FROM php:8.1-fpm-bookworm
 
diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile
index 6d5a0cb..6f7ae4a 100644
--- a/images/8.2-apache/Dockerfile
+++ b/images/8.2-apache/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.2-apache-5 .
+# docker build -t devwithlando/php:8.2-apache-6 .
 
 FROM php:8.2-apache-bookworm
 
diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile
index 2258c8c..5ccdec0 100644
--- a/images/8.2-fpm/Dockerfile
+++ b/images/8.2-fpm/Dockerfile
@@ -1,4 +1,4 @@
-# docker build -t devwithlando/php:8.2-fpm-5 .
+# docker build -t devwithlando/php:8.2-fpm-6 .
 
 FROM php:8.2-fpm-bookworm
 
diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile
index 80e5b35..e6bf9ed 100644
--- a/images/8.3-apache/Dockerfile
+++ b/images/8.3-apache/Dockerfile
@@ -1,41 +1,27 @@
-# docker build -t devwithlando/php:8.3-apache-5 .
+# docker build -t devwithlando/php:8.3-apache-6 .
 
-FROM php:8.3-apache-bookworm
+FROM php:8.3-apache-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
-  exiftool \
-  git-core \
+  libimage-exiftool-perl \
+  git \
   gnupg2 \
   imagemagick \
-  postgresql-client-15 \
+  mariadb-client \
+  mariadb-client-compat \
+  postgresql-client-17 \
   pv \
   rsync \
   ssh \
   unzip \
-  wget \
-  /tmp/sqlite3.deb \
-  /tmp/libsqlite3-0.deb \
-  /tmp/libsqlite3-dev.deb
+  wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile
index de452ee..d90ca19 100644
--- a/images/8.3-fpm/Dockerfile
+++ b/images/8.3-fpm/Dockerfile
@@ -1,42 +1,27 @@
-# docker build -t devwithlando/php:8.3-fpm-5 .
+# docker build -t devwithlando/php:8.3-fpm-6 .
 
-FROM php:8.3-fpm-bookworm
+FROM php:8.3-fpm-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
   default-mysql-client \
-  exiftool \
-  git-core \
+  libimage-exiftool-perl \
+  git \
   gnupg2 \
   imagemagick \
   mariadb-client \
-  postgresql-client-15 \
+  mariadb-client-compat \
+  postgresql-client-17 \
   pv \
   rsync \
   ssh \
   unzip \
-  wget \
-  /tmp/sqlite3.deb \
-  /tmp/libsqlite3-0.deb \
-  /tmp/libsqlite3-dev.deb
+  wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile
index 3f7ceab..b0732d3 100644
--- a/images/8.4-apache/Dockerfile
+++ b/images/8.4-apache/Dockerfile
@@ -1,43 +1,27 @@
-# docker build -t devwithlando/php:8.4-apache-5 .
+# docker build -t devwithlando/php:8.4-apache-6 .
 
-FROM php:8.4-apache-bookworm
+FROM php:8.4-apache-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile
index 0ccb700..3dfdc7f 100644
--- a/images/8.4-fpm/Dockerfile
+++ b/images/8.4-fpm/Dockerfile
@@ -1,44 +1,28 @@
-# docker build -t devwithlando/php:8.4-fpm-5 .
+# docker build -t devwithlando/php:8.4-fpm-6 .
 
-FROM php:8.4-fpm-bookworm
+FROM php:8.4-fpm-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     bzip2 \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
diff --git a/images/8.5-apache/Dockerfile b/images/8.5-apache/Dockerfile
index 280ccbd..914294c 100644
--- a/images/8.5-apache/Dockerfile
+++ b/images/8.5-apache/Dockerfile
@@ -1,43 +1,27 @@
-# docker buildx build -t devwithlando/php:8.5-apache-5 .
+# docker buildx build -t devwithlando/php:8.5-apache-6 .
 
-FROM php:8.5-apache-bookworm
+FROM php:8.5-apache-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
diff --git a/images/8.5-fpm/Dockerfile b/images/8.5-fpm/Dockerfile
index a74be32..5a2710a 100644
--- a/images/8.5-fpm/Dockerfile
+++ b/images/8.5-fpm/Dockerfile
@@ -1,44 +1,28 @@
-# docker buildx build -t devwithlando/php:8.5-fpm-5 .
+# docker buildx build -t devwithlando/php:8.5-fpm-6 .
 
-FROM php:8.5-fpm-bookworm
+FROM php:8.5-fpm-trixie
 
 ARG TARGETARCH
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
-RUN \
-  # MariaDB client compatibility (https://github.com/lando/php/issues/120)
-  mkdir -p /etc/apt/keyrings \
-  && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \
-  && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list
-
-# Drupal 11 requires sqlite3 3.45+
-ARG SQLITE_VERSION=3.45.1
-RUN \
-  curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \
-  && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb"
-
 RUN \
   mkdir -p /usr/share/man/man1 /usr/share/man/man7 \
   && apt -y update && apt-get install -y \
     bzip2 \
     default-mysql-client \
-    exiftool \
-    git-core \
+    libimage-exiftool-perl \
+    git \
     gnupg2 \
     imagemagick \
     mariadb-client \
     mariadb-client-compat \
-    postgresql-client-15 \
+    postgresql-client-17 \
     pv \
     rsync \
     ssh \
     unzip \
-    wget \
-    /tmp/sqlite3.deb \
-    /tmp/libsqlite3-0.deb \
-    /tmp/libsqlite3-dev.deb
+    wget
 
 RUN \
   install-php-extensions @fix_letsencrypt \
diff --git a/netlify.toml b/netlify.toml
index a46e45e..e8a287e 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -10,7 +10,7 @@
 [[context.deploy-preview.plugins]]
   package = "netlify-plugin-checklinks"
   [context.deploy-preview.plugins.inputs]
-    todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net" ]
+    todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net", "hub.docker.com" ]
     skipPatterns = [ ".rss", ".gif", ".jpg" ]
     checkExternal = true