diff --git a/8.2-rc/alpine3.16/cli/Dockerfile b/8.2/alpine3.16/cli/Dockerfile
similarity index 96%
rename from 8.2-rc/alpine3.16/cli/Dockerfile
rename to 8.2/alpine3.16/cli/Dockerfile
index e586c965ae..e4b95f48ba 100644
--- a/8.2-rc/alpine3.16/cli/Dockerfile
+++ b/8.2/alpine3.16/cli/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/alpine3.16/cli/docker-php-entrypoint b/8.2/alpine3.16/cli/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/alpine3.16/cli/docker-php-entrypoint
rename to 8.2/alpine3.16/cli/docker-php-entrypoint
diff --git a/8.2-rc/alpine3.16/cli/docker-php-ext-configure b/8.2/alpine3.16/cli/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/alpine3.16/cli/docker-php-ext-configure
rename to 8.2/alpine3.16/cli/docker-php-ext-configure
diff --git a/8.2-rc/alpine3.16/cli/docker-php-ext-enable b/8.2/alpine3.16/cli/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/alpine3.16/cli/docker-php-ext-enable
rename to 8.2/alpine3.16/cli/docker-php-ext-enable
diff --git a/8.2-rc/alpine3.16/cli/docker-php-ext-install b/8.2/alpine3.16/cli/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/alpine3.16/cli/docker-php-ext-install
rename to 8.2/alpine3.16/cli/docker-php-ext-install
diff --git a/8.2-rc/alpine3.16/cli/docker-php-source b/8.2/alpine3.16/cli/docker-php-source
similarity index 100%
rename from 8.2-rc/alpine3.16/cli/docker-php-source
rename to 8.2/alpine3.16/cli/docker-php-source
diff --git a/8.2-rc/alpine3.16/fpm/Dockerfile b/8.2/alpine3.16/fpm/Dockerfile
similarity index 96%
rename from 8.2-rc/alpine3.16/fpm/Dockerfile
rename to 8.2/alpine3.16/fpm/Dockerfile
index 5b8b766d2d..941731cf5b 100644
--- a/8.2-rc/alpine3.16/fpm/Dockerfile
+++ b/8.2/alpine3.16/fpm/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/alpine3.16/fpm/docker-php-entrypoint b/8.2/alpine3.16/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/alpine3.16/fpm/docker-php-entrypoint
rename to 8.2/alpine3.16/fpm/docker-php-entrypoint
diff --git a/8.2-rc/alpine3.16/zts/docker-php-entrypoint b/8.2/alpine3.16/fpm/docker-php-entrypoint-e
similarity index 100%
rename from 8.2-rc/alpine3.16/zts/docker-php-entrypoint
rename to 8.2/alpine3.16/fpm/docker-php-entrypoint-e
diff --git a/8.2-rc/alpine3.16/fpm/docker-php-ext-configure b/8.2/alpine3.16/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/alpine3.16/fpm/docker-php-ext-configure
rename to 8.2/alpine3.16/fpm/docker-php-ext-configure
diff --git a/8.2-rc/alpine3.16/fpm/docker-php-ext-enable b/8.2/alpine3.16/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/alpine3.16/fpm/docker-php-ext-enable
rename to 8.2/alpine3.16/fpm/docker-php-ext-enable
diff --git a/8.2-rc/alpine3.16/fpm/docker-php-ext-install b/8.2/alpine3.16/fpm/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/alpine3.16/fpm/docker-php-ext-install
rename to 8.2/alpine3.16/fpm/docker-php-ext-install
diff --git a/8.2-rc/alpine3.16/fpm/docker-php-source b/8.2/alpine3.16/fpm/docker-php-source
similarity index 100%
rename from 8.2-rc/alpine3.16/fpm/docker-php-source
rename to 8.2/alpine3.16/fpm/docker-php-source
diff --git a/8.2-rc/alpine3.16/zts/Dockerfile b/8.2/alpine3.16/zts/Dockerfile
similarity index 96%
rename from 8.2-rc/alpine3.16/zts/Dockerfile
rename to 8.2/alpine3.16/zts/Dockerfile
index d7af865dc5..e4b3a2e151 100644
--- a/8.2-rc/alpine3.16/zts/Dockerfile
+++ b/8.2/alpine3.16/zts/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/alpine3.17/cli/docker-php-entrypoint b/8.2/alpine3.16/zts/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/alpine3.17/cli/docker-php-entrypoint
rename to 8.2/alpine3.16/zts/docker-php-entrypoint
diff --git a/8.2-rc/alpine3.16/zts/docker-php-ext-configure b/8.2/alpine3.16/zts/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/alpine3.16/zts/docker-php-ext-configure
rename to 8.2/alpine3.16/zts/docker-php-ext-configure
diff --git a/8.2-rc/alpine3.16/zts/docker-php-ext-enable b/8.2/alpine3.16/zts/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/alpine3.16/zts/docker-php-ext-enable
rename to 8.2/alpine3.16/zts/docker-php-ext-enable
diff --git a/8.2-rc/alpine3.16/zts/docker-php-ext-install b/8.2/alpine3.16/zts/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/alpine3.16/zts/docker-php-ext-install
rename to 8.2/alpine3.16/zts/docker-php-ext-install
diff --git a/8.2-rc/alpine3.16/zts/docker-php-source b/8.2/alpine3.16/zts/docker-php-source
similarity index 100%
rename from 8.2-rc/alpine3.16/zts/docker-php-source
rename to 8.2/alpine3.16/zts/docker-php-source
diff --git a/8.2-rc/alpine3.17/cli/Dockerfile b/8.2/alpine3.17/cli/Dockerfile
similarity index 96%
rename from 8.2-rc/alpine3.17/cli/Dockerfile
rename to 8.2/alpine3.17/cli/Dockerfile
index e412113220..38c4cd4643 100644
--- a/8.2-rc/alpine3.17/cli/Dockerfile
+++ b/8.2/alpine3.17/cli/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/alpine3.17/zts/docker-php-entrypoint b/8.2/alpine3.17/cli/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/alpine3.17/zts/docker-php-entrypoint
rename to 8.2/alpine3.17/cli/docker-php-entrypoint
diff --git a/8.2-rc/alpine3.17/cli/docker-php-ext-configure b/8.2/alpine3.17/cli/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/alpine3.17/cli/docker-php-ext-configure
rename to 8.2/alpine3.17/cli/docker-php-ext-configure
diff --git a/8.2-rc/alpine3.17/cli/docker-php-ext-enable b/8.2/alpine3.17/cli/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/alpine3.17/cli/docker-php-ext-enable
rename to 8.2/alpine3.17/cli/docker-php-ext-enable
diff --git a/8.2-rc/alpine3.17/cli/docker-php-ext-install b/8.2/alpine3.17/cli/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/alpine3.17/cli/docker-php-ext-install
rename to 8.2/alpine3.17/cli/docker-php-ext-install
diff --git a/8.2-rc/alpine3.17/cli/docker-php-source b/8.2/alpine3.17/cli/docker-php-source
similarity index 100%
rename from 8.2-rc/alpine3.17/cli/docker-php-source
rename to 8.2/alpine3.17/cli/docker-php-source
diff --git a/8.2-rc/alpine3.17/fpm/Dockerfile b/8.2/alpine3.17/fpm/Dockerfile
similarity index 96%
rename from 8.2-rc/alpine3.17/fpm/Dockerfile
rename to 8.2/alpine3.17/fpm/Dockerfile
index 82bf7159bc..d8d2c309c5 100644
--- a/8.2-rc/alpine3.17/fpm/Dockerfile
+++ b/8.2/alpine3.17/fpm/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/alpine3.17/fpm/docker-php-entrypoint b/8.2/alpine3.17/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/alpine3.17/fpm/docker-php-entrypoint
rename to 8.2/alpine3.17/fpm/docker-php-entrypoint
diff --git a/8.2-rc/bullseye/cli/docker-php-entrypoint b/8.2/alpine3.17/fpm/docker-php-entrypoint-e
similarity index 100%
rename from 8.2-rc/bullseye/cli/docker-php-entrypoint
rename to 8.2/alpine3.17/fpm/docker-php-entrypoint-e
diff --git a/8.2-rc/alpine3.17/fpm/docker-php-ext-configure b/8.2/alpine3.17/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/alpine3.17/fpm/docker-php-ext-configure
rename to 8.2/alpine3.17/fpm/docker-php-ext-configure
diff --git a/8.2-rc/alpine3.17/fpm/docker-php-ext-enable b/8.2/alpine3.17/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/alpine3.17/fpm/docker-php-ext-enable
rename to 8.2/alpine3.17/fpm/docker-php-ext-enable
diff --git a/8.2-rc/alpine3.17/fpm/docker-php-ext-install b/8.2/alpine3.17/fpm/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/alpine3.17/fpm/docker-php-ext-install
rename to 8.2/alpine3.17/fpm/docker-php-ext-install
diff --git a/8.2-rc/alpine3.17/fpm/docker-php-source b/8.2/alpine3.17/fpm/docker-php-source
similarity index 100%
rename from 8.2-rc/alpine3.17/fpm/docker-php-source
rename to 8.2/alpine3.17/fpm/docker-php-source
diff --git a/8.2-rc/alpine3.17/zts/Dockerfile b/8.2/alpine3.17/zts/Dockerfile
similarity index 96%
rename from 8.2-rc/alpine3.17/zts/Dockerfile
rename to 8.2/alpine3.17/zts/Dockerfile
index 3d44ab580c..691e279a60 100644
--- a/8.2-rc/alpine3.17/zts/Dockerfile
+++ b/8.2/alpine3.17/zts/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/bullseye/zts/docker-php-entrypoint b/8.2/alpine3.17/zts/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/bullseye/zts/docker-php-entrypoint
rename to 8.2/alpine3.17/zts/docker-php-entrypoint
diff --git a/8.2-rc/alpine3.17/zts/docker-php-ext-configure b/8.2/alpine3.17/zts/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/alpine3.17/zts/docker-php-ext-configure
rename to 8.2/alpine3.17/zts/docker-php-ext-configure
diff --git a/8.2-rc/alpine3.17/zts/docker-php-ext-enable b/8.2/alpine3.17/zts/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/alpine3.17/zts/docker-php-ext-enable
rename to 8.2/alpine3.17/zts/docker-php-ext-enable
diff --git a/8.2-rc/alpine3.17/zts/docker-php-ext-install b/8.2/alpine3.17/zts/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/alpine3.17/zts/docker-php-ext-install
rename to 8.2/alpine3.17/zts/docker-php-ext-install
diff --git a/8.2-rc/alpine3.17/zts/docker-php-source b/8.2/alpine3.17/zts/docker-php-source
similarity index 100%
rename from 8.2-rc/alpine3.17/zts/docker-php-source
rename to 8.2/alpine3.17/zts/docker-php-source
diff --git a/8.2-rc/bullseye/apache/Dockerfile b/8.2/bullseye/apache/Dockerfile
similarity index 97%
rename from 8.2-rc/bullseye/apache/Dockerfile
rename to 8.2/bullseye/apache/Dockerfile
index fd4cad1957..714ace7238 100644
--- a/8.2-rc/bullseye/apache/Dockerfile
+++ b/8.2/bullseye/apache/Dockerfile
@@ -118,9 +118,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/bullseye/apache/apache2-foreground b/8.2/bullseye/apache/apache2-foreground
similarity index 100%
rename from 8.2-rc/bullseye/apache/apache2-foreground
rename to 8.2/bullseye/apache/apache2-foreground
diff --git a/8.2-rc/bullseye/apache/docker-php-entrypoint b/8.2/bullseye/apache/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/bullseye/apache/docker-php-entrypoint
rename to 8.2/bullseye/apache/docker-php-entrypoint
diff --git a/8.2-rc/buster/cli/docker-php-entrypoint b/8.2/bullseye/apache/docker-php-entrypoint-e
similarity index 100%
rename from 8.2-rc/buster/cli/docker-php-entrypoint
rename to 8.2/bullseye/apache/docker-php-entrypoint-e
diff --git a/8.2-rc/bullseye/apache/docker-php-ext-configure b/8.2/bullseye/apache/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/bullseye/apache/docker-php-ext-configure
rename to 8.2/bullseye/apache/docker-php-ext-configure
diff --git a/8.2-rc/bullseye/apache/docker-php-ext-enable b/8.2/bullseye/apache/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/bullseye/apache/docker-php-ext-enable
rename to 8.2/bullseye/apache/docker-php-ext-enable
diff --git a/8.2-rc/bullseye/apache/docker-php-ext-install b/8.2/bullseye/apache/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/bullseye/apache/docker-php-ext-install
rename to 8.2/bullseye/apache/docker-php-ext-install
diff --git a/8.2-rc/bullseye/apache/docker-php-source b/8.2/bullseye/apache/docker-php-source
similarity index 100%
rename from 8.2-rc/bullseye/apache/docker-php-source
rename to 8.2/bullseye/apache/docker-php-source
diff --git a/8.2-rc/bullseye/cli/Dockerfile b/8.2/bullseye/cli/Dockerfile
similarity index 96%
rename from 8.2-rc/bullseye/cli/Dockerfile
rename to 8.2/bullseye/cli/Dockerfile
index 38c91cebaa..5d482a5b24 100644
--- a/8.2-rc/bullseye/cli/Dockerfile
+++ b/8.2/bullseye/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/buster/zts/docker-php-entrypoint b/8.2/bullseye/cli/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/buster/zts/docker-php-entrypoint
rename to 8.2/bullseye/cli/docker-php-entrypoint
diff --git a/8.2-rc/bullseye/cli/docker-php-ext-configure b/8.2/bullseye/cli/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/bullseye/cli/docker-php-ext-configure
rename to 8.2/bullseye/cli/docker-php-ext-configure
diff --git a/8.2-rc/bullseye/cli/docker-php-ext-enable b/8.2/bullseye/cli/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/bullseye/cli/docker-php-ext-enable
rename to 8.2/bullseye/cli/docker-php-ext-enable
diff --git a/8.2-rc/bullseye/cli/docker-php-ext-install b/8.2/bullseye/cli/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/bullseye/cli/docker-php-ext-install
rename to 8.2/bullseye/cli/docker-php-ext-install
diff --git a/8.2-rc/bullseye/cli/docker-php-source b/8.2/bullseye/cli/docker-php-source
similarity index 100%
rename from 8.2-rc/bullseye/cli/docker-php-source
rename to 8.2/bullseye/cli/docker-php-source
diff --git a/8.2-rc/bullseye/fpm/Dockerfile b/8.2/bullseye/fpm/Dockerfile
similarity index 97%
rename from 8.2-rc/bullseye/fpm/Dockerfile
rename to 8.2/bullseye/fpm/Dockerfile
index c7305d9214..2b67b48c90 100644
--- a/8.2-rc/bullseye/fpm/Dockerfile
+++ b/8.2/bullseye/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/bullseye/fpm/docker-php-entrypoint b/8.2/bullseye/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/bullseye/fpm/docker-php-entrypoint
rename to 8.2/bullseye/fpm/docker-php-entrypoint
diff --git a/8.2/bullseye/fpm/docker-php-entrypoint-e b/8.2/bullseye/fpm/docker-php-entrypoint-e
new file mode 100755
index 0000000000..88a016c16c
--- /dev/null
+++ b/8.2/bullseye/fpm/docker-php-entrypoint-e
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/8.2-rc/bullseye/fpm/docker-php-ext-configure b/8.2/bullseye/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/bullseye/fpm/docker-php-ext-configure
rename to 8.2/bullseye/fpm/docker-php-ext-configure
diff --git a/8.2-rc/bullseye/fpm/docker-php-ext-enable b/8.2/bullseye/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/bullseye/fpm/docker-php-ext-enable
rename to 8.2/bullseye/fpm/docker-php-ext-enable
diff --git a/8.2-rc/bullseye/fpm/docker-php-ext-install b/8.2/bullseye/fpm/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/bullseye/fpm/docker-php-ext-install
rename to 8.2/bullseye/fpm/docker-php-ext-install
diff --git a/8.2-rc/bullseye/fpm/docker-php-source b/8.2/bullseye/fpm/docker-php-source
similarity index 100%
rename from 8.2-rc/bullseye/fpm/docker-php-source
rename to 8.2/bullseye/fpm/docker-php-source
diff --git a/8.2-rc/bullseye/zts/Dockerfile b/8.2/bullseye/zts/Dockerfile
similarity index 96%
rename from 8.2-rc/bullseye/zts/Dockerfile
rename to 8.2/bullseye/zts/Dockerfile
index ad5231bc0e..19e97620fe 100644
--- a/8.2-rc/bullseye/zts/Dockerfile
+++ b/8.2/bullseye/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2/bullseye/zts/docker-php-entrypoint b/8.2/bullseye/zts/docker-php-entrypoint
new file mode 100755
index 0000000000..88a016c16c
--- /dev/null
+++ b/8.2/bullseye/zts/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/8.2-rc/bullseye/zts/docker-php-ext-configure b/8.2/bullseye/zts/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/bullseye/zts/docker-php-ext-configure
rename to 8.2/bullseye/zts/docker-php-ext-configure
diff --git a/8.2-rc/bullseye/zts/docker-php-ext-enable b/8.2/bullseye/zts/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/bullseye/zts/docker-php-ext-enable
rename to 8.2/bullseye/zts/docker-php-ext-enable
diff --git a/8.2-rc/bullseye/zts/docker-php-ext-install b/8.2/bullseye/zts/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/bullseye/zts/docker-php-ext-install
rename to 8.2/bullseye/zts/docker-php-ext-install
diff --git a/8.2-rc/bullseye/zts/docker-php-source b/8.2/bullseye/zts/docker-php-source
similarity index 100%
rename from 8.2-rc/bullseye/zts/docker-php-source
rename to 8.2/bullseye/zts/docker-php-source
diff --git a/8.2-rc/buster/apache/Dockerfile b/8.2/buster/apache/Dockerfile
similarity index 97%
rename from 8.2-rc/buster/apache/Dockerfile
rename to 8.2/buster/apache/Dockerfile
index 451212ffdc..1b1e9d10f7 100644
--- a/8.2-rc/buster/apache/Dockerfile
+++ b/8.2/buster/apache/Dockerfile
@@ -118,9 +118,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/buster/apache/apache2-foreground b/8.2/buster/apache/apache2-foreground
similarity index 100%
rename from 8.2-rc/buster/apache/apache2-foreground
rename to 8.2/buster/apache/apache2-foreground
diff --git a/8.2-rc/buster/apache/docker-php-entrypoint b/8.2/buster/apache/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/buster/apache/docker-php-entrypoint
rename to 8.2/buster/apache/docker-php-entrypoint
diff --git a/8.2/buster/apache/docker-php-entrypoint-e b/8.2/buster/apache/docker-php-entrypoint-e
new file mode 100755
index 0000000000..88a016c16c
--- /dev/null
+++ b/8.2/buster/apache/docker-php-entrypoint-e
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/8.2-rc/buster/apache/docker-php-ext-configure b/8.2/buster/apache/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/buster/apache/docker-php-ext-configure
rename to 8.2/buster/apache/docker-php-ext-configure
diff --git a/8.2-rc/buster/apache/docker-php-ext-enable b/8.2/buster/apache/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/buster/apache/docker-php-ext-enable
rename to 8.2/buster/apache/docker-php-ext-enable
diff --git a/8.2-rc/buster/apache/docker-php-ext-install b/8.2/buster/apache/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/buster/apache/docker-php-ext-install
rename to 8.2/buster/apache/docker-php-ext-install
diff --git a/8.2-rc/buster/apache/docker-php-source b/8.2/buster/apache/docker-php-source
similarity index 100%
rename from 8.2-rc/buster/apache/docker-php-source
rename to 8.2/buster/apache/docker-php-source
diff --git a/8.2-rc/buster/cli/Dockerfile b/8.2/buster/cli/Dockerfile
similarity index 96%
rename from 8.2-rc/buster/cli/Dockerfile
rename to 8.2/buster/cli/Dockerfile
index 3ab8949b41..ad11cb5bc9 100644
--- a/8.2-rc/buster/cli/Dockerfile
+++ b/8.2/buster/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2/buster/cli/docker-php-entrypoint b/8.2/buster/cli/docker-php-entrypoint
new file mode 100755
index 0000000000..88a016c16c
--- /dev/null
+++ b/8.2/buster/cli/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/8.2-rc/buster/cli/docker-php-ext-configure b/8.2/buster/cli/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/buster/cli/docker-php-ext-configure
rename to 8.2/buster/cli/docker-php-ext-configure
diff --git a/8.2-rc/buster/cli/docker-php-ext-enable b/8.2/buster/cli/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/buster/cli/docker-php-ext-enable
rename to 8.2/buster/cli/docker-php-ext-enable
diff --git a/8.2-rc/buster/cli/docker-php-ext-install b/8.2/buster/cli/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/buster/cli/docker-php-ext-install
rename to 8.2/buster/cli/docker-php-ext-install
diff --git a/8.2-rc/buster/cli/docker-php-source b/8.2/buster/cli/docker-php-source
similarity index 100%
rename from 8.2-rc/buster/cli/docker-php-source
rename to 8.2/buster/cli/docker-php-source
diff --git a/8.2-rc/buster/fpm/Dockerfile b/8.2/buster/fpm/Dockerfile
similarity index 97%
rename from 8.2-rc/buster/fpm/Dockerfile
rename to 8.2/buster/fpm/Dockerfile
index 07f6c3c0d9..27022c3e96 100644
--- a/8.2-rc/buster/fpm/Dockerfile
+++ b/8.2/buster/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2-rc/buster/fpm/docker-php-entrypoint b/8.2/buster/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.2-rc/buster/fpm/docker-php-entrypoint
rename to 8.2/buster/fpm/docker-php-entrypoint
diff --git a/8.2/buster/fpm/docker-php-entrypoint-e b/8.2/buster/fpm/docker-php-entrypoint-e
new file mode 100755
index 0000000000..88a016c16c
--- /dev/null
+++ b/8.2/buster/fpm/docker-php-entrypoint-e
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/8.2-rc/buster/fpm/docker-php-ext-configure b/8.2/buster/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/buster/fpm/docker-php-ext-configure
rename to 8.2/buster/fpm/docker-php-ext-configure
diff --git a/8.2-rc/buster/fpm/docker-php-ext-enable b/8.2/buster/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/buster/fpm/docker-php-ext-enable
rename to 8.2/buster/fpm/docker-php-ext-enable
diff --git a/8.2-rc/buster/fpm/docker-php-ext-install b/8.2/buster/fpm/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/buster/fpm/docker-php-ext-install
rename to 8.2/buster/fpm/docker-php-ext-install
diff --git a/8.2-rc/buster/fpm/docker-php-source b/8.2/buster/fpm/docker-php-source
similarity index 100%
rename from 8.2-rc/buster/fpm/docker-php-source
rename to 8.2/buster/fpm/docker-php-source
diff --git a/8.2-rc/buster/zts/Dockerfile b/8.2/buster/zts/Dockerfile
similarity index 96%
rename from 8.2-rc/buster/zts/Dockerfile
rename to 8.2/buster/zts/Dockerfile
index 175d1e9618..7c8ac658a6 100644
--- a/8.2-rc/buster/zts/Dockerfile
+++ b/8.2/buster/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 39B641343D8C104B2B146DC3F9C39DC0B9698544 E60913E4DF209907D8E30D96659A97C9CF2A795A 1198C0117593497A5EC5C199286AF1F9897469DC
 
-ENV PHP_VERSION 8.2.0RC7
-ENV PHP_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz" PHP_ASC_URL="https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc"
-ENV PHP_SHA256="31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7"
+ENV PHP_VERSION 8.2.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.2.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.2.0.tar.xz.asc"
+ENV PHP_SHA256="6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943"
 
 RUN set -eux; \
 	\
diff --git a/8.2/buster/zts/docker-php-entrypoint b/8.2/buster/zts/docker-php-entrypoint
new file mode 100755
index 0000000000..88a016c16c
--- /dev/null
+++ b/8.2/buster/zts/docker-php-entrypoint
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php "$@"
+fi
+
+exec "$@"
diff --git a/8.2-rc/buster/zts/docker-php-ext-configure b/8.2/buster/zts/docker-php-ext-configure
similarity index 100%
rename from 8.2-rc/buster/zts/docker-php-ext-configure
rename to 8.2/buster/zts/docker-php-ext-configure
diff --git a/8.2-rc/buster/zts/docker-php-ext-enable b/8.2/buster/zts/docker-php-ext-enable
similarity index 100%
rename from 8.2-rc/buster/zts/docker-php-ext-enable
rename to 8.2/buster/zts/docker-php-ext-enable
diff --git a/8.2-rc/buster/zts/docker-php-ext-install b/8.2/buster/zts/docker-php-ext-install
similarity index 100%
rename from 8.2-rc/buster/zts/docker-php-ext-install
rename to 8.2/buster/zts/docker-php-ext-install
diff --git a/8.2-rc/buster/zts/docker-php-source b/8.2/buster/zts/docker-php-source
similarity index 100%
rename from 8.2-rc/buster/zts/docker-php-source
rename to 8.2/buster/zts/docker-php-source
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 2437831eaa..232229d373 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,7 +2,7 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[8.1]='8 latest'
+	[8.2]='8 latest'
 )
 
 self="$(basename "$BASH_SOURCE")"
diff --git a/versions.json b/versions.json
index 332bbe9c4d..766fac2525 100644
--- a/versions.json
+++ b/versions.json
@@ -59,11 +59,10 @@
     ],
     "version": "8.1.13"
   },
-  "8.1-rc": null,
-  "8.2-rc": {
-    "ascUrl": "https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz.asc",
-    "sha256": "31204434c525f85e64f666a766f623443637616b184e8652414f619a127c5ef7",
-    "url": "https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz",
+  "8.2": {
+    "ascUrl": "https://www.php.net/distributions/php-8.2.0.tar.xz.asc",
+    "sha256": "6ea4c2dfb532950fd712aa2a08c1412a6a81cd1334dd0b0bf88a8e44c2b3a943",
+    "url": "https://www.php.net/distributions/php-8.2.0.tar.xz",
     "variants": [
       "bullseye/cli",
       "bullseye/apache",
@@ -80,6 +79,6 @@
       "alpine3.16/fpm",
       "alpine3.16/zts"
     ],
-    "version": "8.2.0RC7"
+    "version": "8.2.0"
   }
 }