diff --git a/11.3/php8.3/apache-bookworm/Dockerfile b/11.3/php8.5/apache-bookworm/Dockerfile
similarity index 99%
rename from 11.3/php8.3/apache-bookworm/Dockerfile
rename to 11.3/php8.5/apache-bookworm/Dockerfile
index d3e7ea82..bc116d74 100644
--- a/11.3/php8.3/apache-bookworm/Dockerfile
+++ b/11.3/php8.5/apache-bookworm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-apache-bookworm
+FROM php:8.5-apache-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/11.3/php8.3/apache-trixie/Dockerfile b/11.3/php8.5/apache-trixie/Dockerfile
similarity index 99%
rename from 11.3/php8.3/apache-trixie/Dockerfile
rename to 11.3/php8.5/apache-trixie/Dockerfile
index 7e34ac89..9e2fe8e0 100644
--- a/11.3/php8.3/apache-trixie/Dockerfile
+++ b/11.3/php8.5/apache-trixie/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-apache-trixie
+FROM php:8.5-apache-trixie
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/11.3/php8.3/fpm-alpine3.22/Dockerfile b/11.3/php8.5/fpm-alpine3.22/Dockerfile
similarity index 98%
rename from 11.3/php8.3/fpm-alpine3.22/Dockerfile
rename to 11.3/php8.5/fpm-alpine3.22/Dockerfile
index a8fb007c..013a7893 100644
--- a/11.3/php8.3/fpm-alpine3.22/Dockerfile
+++ b/11.3/php8.5/fpm-alpine3.22/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-alpine3.22
+FROM php:8.5-fpm-alpine3.22
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/11.3/php8.3/fpm-alpine3.23/Dockerfile b/11.3/php8.5/fpm-alpine3.23/Dockerfile
similarity index 98%
rename from 11.3/php8.3/fpm-alpine3.23/Dockerfile
rename to 11.3/php8.5/fpm-alpine3.23/Dockerfile
index bb3025a4..4d72572c 100644
--- a/11.3/php8.3/fpm-alpine3.23/Dockerfile
+++ b/11.3/php8.5/fpm-alpine3.23/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-alpine3.23
+FROM php:8.5-fpm-alpine3.23
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/11.3/php8.3/fpm-bookworm/Dockerfile b/11.3/php8.5/fpm-bookworm/Dockerfile
similarity index 99%
rename from 11.3/php8.3/fpm-bookworm/Dockerfile
rename to 11.3/php8.5/fpm-bookworm/Dockerfile
index 63ce592c..b1b38a13 100644
--- a/11.3/php8.3/fpm-bookworm/Dockerfile
+++ b/11.3/php8.5/fpm-bookworm/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-bookworm
+FROM php:8.5-fpm-bookworm
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/11.3/php8.3/fpm-trixie/Dockerfile b/11.3/php8.5/fpm-trixie/Dockerfile
similarity index 99%
rename from 11.3/php8.3/fpm-trixie/Dockerfile
rename to 11.3/php8.5/fpm-trixie/Dockerfile
index 60a256b9..0152590c 100644
--- a/11.3/php8.3/fpm-trixie/Dockerfile
+++ b/11.3/php8.5/fpm-trixie/Dockerfile
@@ -5,7 +5,7 @@
 #
 
 # https://www.drupal.org/docs/system-requirements/php-requirements
-FROM php:8.3-fpm-trixie
+FROM php:8.5-fpm-trixie
 
 # install the PHP extensions we need
 RUN set -eux; \
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 97b04500..4cef170f 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -11,11 +11,13 @@ declare -A debianSuites=(
 	#[11.2]='bookworm'
 )
 
-defaultPhpVersion='php8.4'
+defaultPhpVersion='php8.5'
 declare -A defaultPhpVersions=(
-# releases older than 11 will conservatively stay on 8.2 by default
-	[11.1]='php8.3'
-	[10.4]='php8.3'
+# releases up to 11.3 will conservatively stay on 8.4 by default
+	[11.3]='php8.4'
+	[11.2]='php8.4'
+	[10.6]='php8.4'
+	[10.5]='php8.4'
 # https://www.drupal.org/docs/system-requirements/php-requirements
 )
 
diff --git a/versions.json b/versions.json
index 73e8207f..b1a535af 100644
--- a/versions.json
+++ b/versions.json
@@ -1,5 +1,4 @@
 {
-  "11.3-rc": null,
   "11.3": {
     "version": "11.3.2",
     "url": "https://ftp.drupal.org/files/projects/drupal-11.3.2.tar.gz",
@@ -7,8 +6,8 @@
     "date": 1767865697,
     "notes": "https://www.drupal.org/project/drupal/releases/11.3.2",
     "phpVersions": [
-      "8.4",
-      "8.3"
+      "8.5",
+      "8.4"
     ],
     "variants": [
       "apache-trixie",
@@ -44,8 +43,6 @@
       "version": "2"
     }
   },
-  "11.1": null,
-  "10.6-rc": null,
   "10.6": {
     "version": "10.6.2",
     "url": "https://ftp.drupal.org/files/projects/drupal-10.6.2.tar.gz",
@@ -89,6 +86,5 @@
     "composer": {
       "version": "2"
     }
-  },
-  "10.4": null
+  }
 }
diff --git a/versions.sh b/versions.sh
index 65cb47fc..35cfd266 100755
--- a/versions.sh
+++ b/versions.sh
@@ -111,13 +111,19 @@ for version in "${versions[@]}"; do
 			phpVersions: (
 				# https://www.drupal.org/docs/system-requirements/php-requirements
 				[
+					# Drupal 11.3+ supports PHP 8.5
+					if env.version | IN("10.5", "10.6", "11.2") then empty else
+						"8.5"
+					end,
 					# Drupal 11.1+ and 10.4+ support PHP 8.4
 					"8.4",
-					# https://www.drupal.org/project/drupal/releases/10.2.0-rc1#php-deps
-					# Drupal supports PHP 8.3 and recommends at least PHP 8.2.
-					"8.3",
-					# https://www.drupal.org/docs/system-requirements/php-requirements
-					empty
+					# Drupal 11.3+ and 10.6+ recommend PHP 8.4; keep 8.3 for 'existing' builds
+					# https://github.com/docker-library/drupal/pull/299
+					# https://www.drupal.org/project/drupal/releases/10.6.0#platform
+					# https://www.drupal.org/project/drupal/releases/11.3.0#platform
+					if env.version | IN("10.5", "10.6", "11.2") then
+						"8.3"
+					else empty end
 				]
 			),
 			variants: [