diff --git a/8.5-rc/alpine3.21/cli/Dockerfile b/8.5/alpine3.21/cli/Dockerfile
similarity index 96%
rename from 8.5-rc/alpine3.21/cli/Dockerfile
rename to 8.5/alpine3.21/cli/Dockerfile
index 89e752446..1a530469e 100644
--- a/8.5-rc/alpine3.21/cli/Dockerfile
+++ b/8.5/alpine3.21/cli/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/alpine3.21/cli/docker-php-entrypoint b/8.5/alpine3.21/cli/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/alpine3.21/cli/docker-php-entrypoint
rename to 8.5/alpine3.21/cli/docker-php-entrypoint
diff --git a/8.5-rc/alpine3.21/cli/docker-php-ext-configure b/8.5/alpine3.21/cli/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/alpine3.21/cli/docker-php-ext-configure
rename to 8.5/alpine3.21/cli/docker-php-ext-configure
diff --git a/8.5-rc/alpine3.21/cli/docker-php-ext-enable b/8.5/alpine3.21/cli/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/alpine3.21/cli/docker-php-ext-enable
rename to 8.5/alpine3.21/cli/docker-php-ext-enable
diff --git a/8.5-rc/alpine3.21/cli/docker-php-ext-install b/8.5/alpine3.21/cli/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/alpine3.21/cli/docker-php-ext-install
rename to 8.5/alpine3.21/cli/docker-php-ext-install
diff --git a/8.5-rc/alpine3.21/cli/docker-php-source b/8.5/alpine3.21/cli/docker-php-source
similarity index 100%
rename from 8.5-rc/alpine3.21/cli/docker-php-source
rename to 8.5/alpine3.21/cli/docker-php-source
diff --git a/8.5-rc/alpine3.21/fpm/Dockerfile b/8.5/alpine3.21/fpm/Dockerfile
similarity index 96%
rename from 8.5-rc/alpine3.21/fpm/Dockerfile
rename to 8.5/alpine3.21/fpm/Dockerfile
index 61f9247c4..22124d276 100644
--- a/8.5-rc/alpine3.21/fpm/Dockerfile
+++ b/8.5/alpine3.21/fpm/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/alpine3.21/fpm/docker-php-entrypoint b/8.5/alpine3.21/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/alpine3.21/fpm/docker-php-entrypoint
rename to 8.5/alpine3.21/fpm/docker-php-entrypoint
diff --git a/8.5-rc/alpine3.21/fpm/docker-php-ext-configure b/8.5/alpine3.21/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/alpine3.21/fpm/docker-php-ext-configure
rename to 8.5/alpine3.21/fpm/docker-php-ext-configure
diff --git a/8.5-rc/alpine3.21/fpm/docker-php-ext-enable b/8.5/alpine3.21/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/alpine3.21/fpm/docker-php-ext-enable
rename to 8.5/alpine3.21/fpm/docker-php-ext-enable
diff --git a/8.5-rc/alpine3.21/fpm/docker-php-ext-install b/8.5/alpine3.21/fpm/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/alpine3.21/fpm/docker-php-ext-install
rename to 8.5/alpine3.21/fpm/docker-php-ext-install
diff --git a/8.5-rc/alpine3.21/fpm/docker-php-source b/8.5/alpine3.21/fpm/docker-php-source
similarity index 100%
rename from 8.5-rc/alpine3.21/fpm/docker-php-source
rename to 8.5/alpine3.21/fpm/docker-php-source
diff --git a/8.5-rc/alpine3.21/zts/Dockerfile b/8.5/alpine3.21/zts/Dockerfile
similarity index 96%
rename from 8.5-rc/alpine3.21/zts/Dockerfile
rename to 8.5/alpine3.21/zts/Dockerfile
index 2e258298a..4a7cd42bc 100644
--- a/8.5-rc/alpine3.21/zts/Dockerfile
+++ b/8.5/alpine3.21/zts/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/alpine3.21/zts/docker-php-entrypoint b/8.5/alpine3.21/zts/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/alpine3.21/zts/docker-php-entrypoint
rename to 8.5/alpine3.21/zts/docker-php-entrypoint
diff --git a/8.5-rc/alpine3.21/zts/docker-php-ext-configure b/8.5/alpine3.21/zts/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/alpine3.21/zts/docker-php-ext-configure
rename to 8.5/alpine3.21/zts/docker-php-ext-configure
diff --git a/8.5-rc/alpine3.21/zts/docker-php-ext-enable b/8.5/alpine3.21/zts/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/alpine3.21/zts/docker-php-ext-enable
rename to 8.5/alpine3.21/zts/docker-php-ext-enable
diff --git a/8.5-rc/alpine3.21/zts/docker-php-ext-install b/8.5/alpine3.21/zts/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/alpine3.21/zts/docker-php-ext-install
rename to 8.5/alpine3.21/zts/docker-php-ext-install
diff --git a/8.5-rc/alpine3.21/zts/docker-php-source b/8.5/alpine3.21/zts/docker-php-source
similarity index 100%
rename from 8.5-rc/alpine3.21/zts/docker-php-source
rename to 8.5/alpine3.21/zts/docker-php-source
diff --git a/8.5-rc/alpine3.22/cli/Dockerfile b/8.5/alpine3.22/cli/Dockerfile
similarity index 96%
rename from 8.5-rc/alpine3.22/cli/Dockerfile
rename to 8.5/alpine3.22/cli/Dockerfile
index a55feaf56..dc86405b0 100644
--- a/8.5-rc/alpine3.22/cli/Dockerfile
+++ b/8.5/alpine3.22/cli/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/alpine3.22/cli/docker-php-entrypoint b/8.5/alpine3.22/cli/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/alpine3.22/cli/docker-php-entrypoint
rename to 8.5/alpine3.22/cli/docker-php-entrypoint
diff --git a/8.5-rc/alpine3.22/cli/docker-php-ext-configure b/8.5/alpine3.22/cli/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/alpine3.22/cli/docker-php-ext-configure
rename to 8.5/alpine3.22/cli/docker-php-ext-configure
diff --git a/8.5-rc/alpine3.22/cli/docker-php-ext-enable b/8.5/alpine3.22/cli/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/alpine3.22/cli/docker-php-ext-enable
rename to 8.5/alpine3.22/cli/docker-php-ext-enable
diff --git a/8.5-rc/alpine3.22/cli/docker-php-ext-install b/8.5/alpine3.22/cli/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/alpine3.22/cli/docker-php-ext-install
rename to 8.5/alpine3.22/cli/docker-php-ext-install
diff --git a/8.5-rc/alpine3.22/cli/docker-php-source b/8.5/alpine3.22/cli/docker-php-source
similarity index 100%
rename from 8.5-rc/alpine3.22/cli/docker-php-source
rename to 8.5/alpine3.22/cli/docker-php-source
diff --git a/8.5-rc/alpine3.22/fpm/Dockerfile b/8.5/alpine3.22/fpm/Dockerfile
similarity index 96%
rename from 8.5-rc/alpine3.22/fpm/Dockerfile
rename to 8.5/alpine3.22/fpm/Dockerfile
index 6af105bd8..105702c12 100644
--- a/8.5-rc/alpine3.22/fpm/Dockerfile
+++ b/8.5/alpine3.22/fpm/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/alpine3.22/fpm/docker-php-entrypoint b/8.5/alpine3.22/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/alpine3.22/fpm/docker-php-entrypoint
rename to 8.5/alpine3.22/fpm/docker-php-entrypoint
diff --git a/8.5-rc/alpine3.22/fpm/docker-php-ext-configure b/8.5/alpine3.22/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/alpine3.22/fpm/docker-php-ext-configure
rename to 8.5/alpine3.22/fpm/docker-php-ext-configure
diff --git a/8.5-rc/alpine3.22/fpm/docker-php-ext-enable b/8.5/alpine3.22/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/alpine3.22/fpm/docker-php-ext-enable
rename to 8.5/alpine3.22/fpm/docker-php-ext-enable
diff --git a/8.5-rc/alpine3.22/fpm/docker-php-ext-install b/8.5/alpine3.22/fpm/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/alpine3.22/fpm/docker-php-ext-install
rename to 8.5/alpine3.22/fpm/docker-php-ext-install
diff --git a/8.5-rc/alpine3.22/fpm/docker-php-source b/8.5/alpine3.22/fpm/docker-php-source
similarity index 100%
rename from 8.5-rc/alpine3.22/fpm/docker-php-source
rename to 8.5/alpine3.22/fpm/docker-php-source
diff --git a/8.5-rc/alpine3.22/zts/Dockerfile b/8.5/alpine3.22/zts/Dockerfile
similarity index 96%
rename from 8.5-rc/alpine3.22/zts/Dockerfile
rename to 8.5/alpine3.22/zts/Dockerfile
index 2a7ff8e57..945aa8c9a 100644
--- a/8.5-rc/alpine3.22/zts/Dockerfile
+++ b/8.5/alpine3.22/zts/Dockerfile
@@ -56,9 +56,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/alpine3.22/zts/docker-php-entrypoint b/8.5/alpine3.22/zts/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/alpine3.22/zts/docker-php-entrypoint
rename to 8.5/alpine3.22/zts/docker-php-entrypoint
diff --git a/8.5-rc/alpine3.22/zts/docker-php-ext-configure b/8.5/alpine3.22/zts/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/alpine3.22/zts/docker-php-ext-configure
rename to 8.5/alpine3.22/zts/docker-php-ext-configure
diff --git a/8.5-rc/alpine3.22/zts/docker-php-ext-enable b/8.5/alpine3.22/zts/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/alpine3.22/zts/docker-php-ext-enable
rename to 8.5/alpine3.22/zts/docker-php-ext-enable
diff --git a/8.5-rc/alpine3.22/zts/docker-php-ext-install b/8.5/alpine3.22/zts/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/alpine3.22/zts/docker-php-ext-install
rename to 8.5/alpine3.22/zts/docker-php-ext-install
diff --git a/8.5-rc/alpine3.22/zts/docker-php-source b/8.5/alpine3.22/zts/docker-php-source
similarity index 100%
rename from 8.5-rc/alpine3.22/zts/docker-php-source
rename to 8.5/alpine3.22/zts/docker-php-source
diff --git a/8.5-rc/bookworm/apache/Dockerfile b/8.5/bookworm/apache/Dockerfile
similarity index 97%
rename from 8.5-rc/bookworm/apache/Dockerfile
rename to 8.5/bookworm/apache/Dockerfile
index ef2699ecb..eac29b026 100644
--- a/8.5-rc/bookworm/apache/Dockerfile
+++ b/8.5/bookworm/apache/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/bookworm/apache/apache2-foreground b/8.5/bookworm/apache/apache2-foreground
similarity index 100%
rename from 8.5-rc/bookworm/apache/apache2-foreground
rename to 8.5/bookworm/apache/apache2-foreground
diff --git a/8.5-rc/bookworm/apache/docker-php-entrypoint b/8.5/bookworm/apache/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/bookworm/apache/docker-php-entrypoint
rename to 8.5/bookworm/apache/docker-php-entrypoint
diff --git a/8.5-rc/bookworm/apache/docker-php-ext-configure b/8.5/bookworm/apache/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/bookworm/apache/docker-php-ext-configure
rename to 8.5/bookworm/apache/docker-php-ext-configure
diff --git a/8.5-rc/bookworm/apache/docker-php-ext-enable b/8.5/bookworm/apache/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/bookworm/apache/docker-php-ext-enable
rename to 8.5/bookworm/apache/docker-php-ext-enable
diff --git a/8.5-rc/bookworm/apache/docker-php-ext-install b/8.5/bookworm/apache/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/bookworm/apache/docker-php-ext-install
rename to 8.5/bookworm/apache/docker-php-ext-install
diff --git a/8.5-rc/bookworm/apache/docker-php-source b/8.5/bookworm/apache/docker-php-source
similarity index 100%
rename from 8.5-rc/bookworm/apache/docker-php-source
rename to 8.5/bookworm/apache/docker-php-source
diff --git a/8.5-rc/bookworm/cli/Dockerfile b/8.5/bookworm/cli/Dockerfile
similarity index 96%
rename from 8.5-rc/bookworm/cli/Dockerfile
rename to 8.5/bookworm/cli/Dockerfile
index f36fd8edf..5c92ec020 100644
--- a/8.5-rc/bookworm/cli/Dockerfile
+++ b/8.5/bookworm/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/bookworm/cli/docker-php-entrypoint b/8.5/bookworm/cli/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/bookworm/cli/docker-php-entrypoint
rename to 8.5/bookworm/cli/docker-php-entrypoint
diff --git a/8.5-rc/bookworm/cli/docker-php-ext-configure b/8.5/bookworm/cli/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/bookworm/cli/docker-php-ext-configure
rename to 8.5/bookworm/cli/docker-php-ext-configure
diff --git a/8.5-rc/bookworm/cli/docker-php-ext-enable b/8.5/bookworm/cli/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/bookworm/cli/docker-php-ext-enable
rename to 8.5/bookworm/cli/docker-php-ext-enable
diff --git a/8.5-rc/bookworm/cli/docker-php-ext-install b/8.5/bookworm/cli/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/bookworm/cli/docker-php-ext-install
rename to 8.5/bookworm/cli/docker-php-ext-install
diff --git a/8.5-rc/bookworm/cli/docker-php-source b/8.5/bookworm/cli/docker-php-source
similarity index 100%
rename from 8.5-rc/bookworm/cli/docker-php-source
rename to 8.5/bookworm/cli/docker-php-source
diff --git a/8.5-rc/bookworm/fpm/Dockerfile b/8.5/bookworm/fpm/Dockerfile
similarity index 97%
rename from 8.5-rc/bookworm/fpm/Dockerfile
rename to 8.5/bookworm/fpm/Dockerfile
index 0fe6c8455..11ecb4811 100644
--- a/8.5-rc/bookworm/fpm/Dockerfile
+++ b/8.5/bookworm/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/bookworm/fpm/docker-php-entrypoint b/8.5/bookworm/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/bookworm/fpm/docker-php-entrypoint
rename to 8.5/bookworm/fpm/docker-php-entrypoint
diff --git a/8.5-rc/bookworm/fpm/docker-php-ext-configure b/8.5/bookworm/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/bookworm/fpm/docker-php-ext-configure
rename to 8.5/bookworm/fpm/docker-php-ext-configure
diff --git a/8.5-rc/bookworm/fpm/docker-php-ext-enable b/8.5/bookworm/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/bookworm/fpm/docker-php-ext-enable
rename to 8.5/bookworm/fpm/docker-php-ext-enable
diff --git a/8.5-rc/bookworm/fpm/docker-php-ext-install b/8.5/bookworm/fpm/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/bookworm/fpm/docker-php-ext-install
rename to 8.5/bookworm/fpm/docker-php-ext-install
diff --git a/8.5-rc/bookworm/fpm/docker-php-source b/8.5/bookworm/fpm/docker-php-source
similarity index 100%
rename from 8.5-rc/bookworm/fpm/docker-php-source
rename to 8.5/bookworm/fpm/docker-php-source
diff --git a/8.5-rc/bookworm/zts/Dockerfile b/8.5/bookworm/zts/Dockerfile
similarity index 96%
rename from 8.5-rc/bookworm/zts/Dockerfile
rename to 8.5/bookworm/zts/Dockerfile
index 341636268..d83896d8d 100644
--- a/8.5-rc/bookworm/zts/Dockerfile
+++ b/8.5/bookworm/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/bookworm/zts/docker-php-entrypoint b/8.5/bookworm/zts/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/bookworm/zts/docker-php-entrypoint
rename to 8.5/bookworm/zts/docker-php-entrypoint
diff --git a/8.5-rc/bookworm/zts/docker-php-ext-configure b/8.5/bookworm/zts/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/bookworm/zts/docker-php-ext-configure
rename to 8.5/bookworm/zts/docker-php-ext-configure
diff --git a/8.5-rc/bookworm/zts/docker-php-ext-enable b/8.5/bookworm/zts/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/bookworm/zts/docker-php-ext-enable
rename to 8.5/bookworm/zts/docker-php-ext-enable
diff --git a/8.5-rc/bookworm/zts/docker-php-ext-install b/8.5/bookworm/zts/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/bookworm/zts/docker-php-ext-install
rename to 8.5/bookworm/zts/docker-php-ext-install
diff --git a/8.5-rc/bookworm/zts/docker-php-source b/8.5/bookworm/zts/docker-php-source
similarity index 100%
rename from 8.5-rc/bookworm/zts/docker-php-source
rename to 8.5/bookworm/zts/docker-php-source
diff --git a/8.5-rc/trixie/apache/Dockerfile b/8.5/trixie/apache/Dockerfile
similarity index 97%
rename from 8.5-rc/trixie/apache/Dockerfile
rename to 8.5/trixie/apache/Dockerfile
index dce229747..da812f910 100644
--- a/8.5-rc/trixie/apache/Dockerfile
+++ b/8.5/trixie/apache/Dockerfile
@@ -120,9 +120,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/trixie/apache/apache2-foreground b/8.5/trixie/apache/apache2-foreground
similarity index 100%
rename from 8.5-rc/trixie/apache/apache2-foreground
rename to 8.5/trixie/apache/apache2-foreground
diff --git a/8.5-rc/trixie/apache/docker-php-entrypoint b/8.5/trixie/apache/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/trixie/apache/docker-php-entrypoint
rename to 8.5/trixie/apache/docker-php-entrypoint
diff --git a/8.5-rc/trixie/apache/docker-php-ext-configure b/8.5/trixie/apache/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/trixie/apache/docker-php-ext-configure
rename to 8.5/trixie/apache/docker-php-ext-configure
diff --git a/8.5-rc/trixie/apache/docker-php-ext-enable b/8.5/trixie/apache/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/trixie/apache/docker-php-ext-enable
rename to 8.5/trixie/apache/docker-php-ext-enable
diff --git a/8.5-rc/trixie/apache/docker-php-ext-install b/8.5/trixie/apache/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/trixie/apache/docker-php-ext-install
rename to 8.5/trixie/apache/docker-php-ext-install
diff --git a/8.5-rc/trixie/apache/docker-php-source b/8.5/trixie/apache/docker-php-source
similarity index 100%
rename from 8.5-rc/trixie/apache/docker-php-source
rename to 8.5/trixie/apache/docker-php-source
diff --git a/8.5-rc/trixie/cli/Dockerfile b/8.5/trixie/cli/Dockerfile
similarity index 96%
rename from 8.5-rc/trixie/cli/Dockerfile
rename to 8.5/trixie/cli/Dockerfile
index 8e519cb6d..3db1f59fe 100644
--- a/8.5-rc/trixie/cli/Dockerfile
+++ b/8.5/trixie/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/trixie/cli/docker-php-entrypoint b/8.5/trixie/cli/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/trixie/cli/docker-php-entrypoint
rename to 8.5/trixie/cli/docker-php-entrypoint
diff --git a/8.5-rc/trixie/cli/docker-php-ext-configure b/8.5/trixie/cli/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/trixie/cli/docker-php-ext-configure
rename to 8.5/trixie/cli/docker-php-ext-configure
diff --git a/8.5-rc/trixie/cli/docker-php-ext-enable b/8.5/trixie/cli/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/trixie/cli/docker-php-ext-enable
rename to 8.5/trixie/cli/docker-php-ext-enable
diff --git a/8.5-rc/trixie/cli/docker-php-ext-install b/8.5/trixie/cli/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/trixie/cli/docker-php-ext-install
rename to 8.5/trixie/cli/docker-php-ext-install
diff --git a/8.5-rc/trixie/cli/docker-php-source b/8.5/trixie/cli/docker-php-source
similarity index 100%
rename from 8.5-rc/trixie/cli/docker-php-source
rename to 8.5/trixie/cli/docker-php-source
diff --git a/8.5-rc/trixie/fpm/Dockerfile b/8.5/trixie/fpm/Dockerfile
similarity index 97%
rename from 8.5-rc/trixie/fpm/Dockerfile
rename to 8.5/trixie/fpm/Dockerfile
index 909dc3653..434465d41 100644
--- a/8.5-rc/trixie/fpm/Dockerfile
+++ b/8.5/trixie/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/trixie/fpm/docker-php-entrypoint b/8.5/trixie/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/trixie/fpm/docker-php-entrypoint
rename to 8.5/trixie/fpm/docker-php-entrypoint
diff --git a/8.5-rc/trixie/fpm/docker-php-ext-configure b/8.5/trixie/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/trixie/fpm/docker-php-ext-configure
rename to 8.5/trixie/fpm/docker-php-ext-configure
diff --git a/8.5-rc/trixie/fpm/docker-php-ext-enable b/8.5/trixie/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/trixie/fpm/docker-php-ext-enable
rename to 8.5/trixie/fpm/docker-php-ext-enable
diff --git a/8.5-rc/trixie/fpm/docker-php-ext-install b/8.5/trixie/fpm/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/trixie/fpm/docker-php-ext-install
rename to 8.5/trixie/fpm/docker-php-ext-install
diff --git a/8.5-rc/trixie/fpm/docker-php-source b/8.5/trixie/fpm/docker-php-source
similarity index 100%
rename from 8.5-rc/trixie/fpm/docker-php-source
rename to 8.5/trixie/fpm/docker-php-source
diff --git a/8.5-rc/trixie/zts/Dockerfile b/8.5/trixie/zts/Dockerfile
similarity index 96%
rename from 8.5-rc/trixie/zts/Dockerfile
rename to 8.5/trixie/zts/Dockerfile
index 013a1d5bd..f99f8d550 100644
--- a/8.5-rc/trixie/zts/Dockerfile
+++ b/8.5/trixie/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1198C0117593497A5EC5C199286AF1F9897469DC 49D9AF6BC72A80D6691719C8AA23F5BE9C7097D4 D95C03BC702BE9515344AE3374E44BC9067701A5
 
-ENV PHP_VERSION 8.5.0RC5
-ENV PHP_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc"
-ENV PHP_SHA256="4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954"
+ENV PHP_VERSION 8.5.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.5.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.5.0.tar.xz.asc"
+ENV PHP_SHA256="39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e"
 
 RUN set -eux; \
 	\
diff --git a/8.5-rc/trixie/zts/docker-php-entrypoint b/8.5/trixie/zts/docker-php-entrypoint
similarity index 100%
rename from 8.5-rc/trixie/zts/docker-php-entrypoint
rename to 8.5/trixie/zts/docker-php-entrypoint
diff --git a/8.5-rc/trixie/zts/docker-php-ext-configure b/8.5/trixie/zts/docker-php-ext-configure
similarity index 100%
rename from 8.5-rc/trixie/zts/docker-php-ext-configure
rename to 8.5/trixie/zts/docker-php-ext-configure
diff --git a/8.5-rc/trixie/zts/docker-php-ext-enable b/8.5/trixie/zts/docker-php-ext-enable
similarity index 100%
rename from 8.5-rc/trixie/zts/docker-php-ext-enable
rename to 8.5/trixie/zts/docker-php-ext-enable
diff --git a/8.5-rc/trixie/zts/docker-php-ext-install b/8.5/trixie/zts/docker-php-ext-install
similarity index 100%
rename from 8.5-rc/trixie/zts/docker-php-ext-install
rename to 8.5/trixie/zts/docker-php-ext-install
diff --git a/8.5-rc/trixie/zts/docker-php-source b/8.5/trixie/zts/docker-php-source
similarity index 100%
rename from 8.5-rc/trixie/zts/docker-php-source
rename to 8.5/trixie/zts/docker-php-source
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index a887c8cbb..d22e3a06a 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,7 +2,7 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[8.4]='8 latest'
+	[8.5]='8 latest'
 )
 
 self="$(basename "$BASH_SOURCE")"
diff --git a/versions.json b/versions.json
index 3740aab0a..791386c6f 100644
--- a/versions.json
+++ b/versions.json
@@ -91,11 +91,11 @@
     ]
   },
   "8.4-rc": null,
-  "8.5-rc": {
-    "version": "8.5.0RC5",
-    "url": "https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz",
-    "ascUrl": "https://downloads.php.net/~daniels/php-8.5.0RC5.tar.xz.asc",
-    "sha256": "4964cdbaf2447afba100c4199ec9c59c41ca4cc23db8d1e38ac7e57aab028954",
+  "8.5": {
+    "version": "8.5.0",
+    "url": "https://www.php.net/distributions/php-8.5.0.tar.xz",
+    "ascUrl": "https://www.php.net/distributions/php-8.5.0.tar.xz.asc",
+    "sha256": "39cb6e4acd679b574d3d3276f148213e935fc25f90403eb84fb1b836a806ef1e",
     "variants": [
       "trixie/cli",
       "trixie/apache",
@@ -112,5 +112,6 @@
       "alpine3.21/fpm",
       "alpine3.21/zts"
     ]
-  }
+  },
+  "8.5-rc": null
 }