diff --git a/8.1-rc/alpine3.14/cli/Dockerfile b/8.1/alpine3.14/cli/Dockerfile
similarity index 96%
rename from 8.1-rc/alpine3.14/cli/Dockerfile
rename to 8.1/alpine3.14/cli/Dockerfile
index 7e64271f..dec26540 100644
--- a/8.1-rc/alpine3.14/cli/Dockerfile
+++ b/8.1/alpine3.14/cli/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/alpine3.14/cli/docker-php-entrypoint b/8.1/alpine3.14/cli/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/alpine3.14/cli/docker-php-entrypoint
rename to 8.1/alpine3.14/cli/docker-php-entrypoint
diff --git a/8.1-rc/alpine3.14/cli/docker-php-ext-configure b/8.1/alpine3.14/cli/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/alpine3.14/cli/docker-php-ext-configure
rename to 8.1/alpine3.14/cli/docker-php-ext-configure
diff --git a/8.1-rc/alpine3.14/cli/docker-php-ext-enable b/8.1/alpine3.14/cli/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/alpine3.14/cli/docker-php-ext-enable
rename to 8.1/alpine3.14/cli/docker-php-ext-enable
diff --git a/8.1-rc/alpine3.14/cli/docker-php-ext-install b/8.1/alpine3.14/cli/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/alpine3.14/cli/docker-php-ext-install
rename to 8.1/alpine3.14/cli/docker-php-ext-install
diff --git a/8.1-rc/alpine3.14/cli/docker-php-source b/8.1/alpine3.14/cli/docker-php-source
similarity index 100%
rename from 8.1-rc/alpine3.14/cli/docker-php-source
rename to 8.1/alpine3.14/cli/docker-php-source
diff --git a/8.1-rc/alpine3.14/fpm/Dockerfile b/8.1/alpine3.14/fpm/Dockerfile
similarity index 96%
rename from 8.1-rc/alpine3.14/fpm/Dockerfile
rename to 8.1/alpine3.14/fpm/Dockerfile
index c112e96f..7b51b1c0 100644
--- a/8.1-rc/alpine3.14/fpm/Dockerfile
+++ b/8.1/alpine3.14/fpm/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/alpine3.14/fpm/docker-php-entrypoint b/8.1/alpine3.14/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/alpine3.14/fpm/docker-php-entrypoint
rename to 8.1/alpine3.14/fpm/docker-php-entrypoint
diff --git a/8.1-rc/alpine3.14/fpm/docker-php-ext-configure b/8.1/alpine3.14/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/alpine3.14/fpm/docker-php-ext-configure
rename to 8.1/alpine3.14/fpm/docker-php-ext-configure
diff --git a/8.1-rc/alpine3.14/fpm/docker-php-ext-enable b/8.1/alpine3.14/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/alpine3.14/fpm/docker-php-ext-enable
rename to 8.1/alpine3.14/fpm/docker-php-ext-enable
diff --git a/8.1-rc/alpine3.14/fpm/docker-php-ext-install b/8.1/alpine3.14/fpm/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/alpine3.14/fpm/docker-php-ext-install
rename to 8.1/alpine3.14/fpm/docker-php-ext-install
diff --git a/8.1-rc/alpine3.14/fpm/docker-php-source b/8.1/alpine3.14/fpm/docker-php-source
similarity index 100%
rename from 8.1-rc/alpine3.14/fpm/docker-php-source
rename to 8.1/alpine3.14/fpm/docker-php-source
diff --git a/8.1-rc/alpine3.15/cli/Dockerfile b/8.1/alpine3.15/cli/Dockerfile
similarity index 96%
rename from 8.1-rc/alpine3.15/cli/Dockerfile
rename to 8.1/alpine3.15/cli/Dockerfile
index 6a56dd7b..f16e7152 100644
--- a/8.1-rc/alpine3.15/cli/Dockerfile
+++ b/8.1/alpine3.15/cli/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/alpine3.15/cli/docker-php-entrypoint b/8.1/alpine3.15/cli/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/alpine3.15/cli/docker-php-entrypoint
rename to 8.1/alpine3.15/cli/docker-php-entrypoint
diff --git a/8.1-rc/alpine3.15/cli/docker-php-ext-configure b/8.1/alpine3.15/cli/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/alpine3.15/cli/docker-php-ext-configure
rename to 8.1/alpine3.15/cli/docker-php-ext-configure
diff --git a/8.1-rc/alpine3.15/cli/docker-php-ext-enable b/8.1/alpine3.15/cli/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/alpine3.15/cli/docker-php-ext-enable
rename to 8.1/alpine3.15/cli/docker-php-ext-enable
diff --git a/8.1-rc/alpine3.15/cli/docker-php-ext-install b/8.1/alpine3.15/cli/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/alpine3.15/cli/docker-php-ext-install
rename to 8.1/alpine3.15/cli/docker-php-ext-install
diff --git a/8.1-rc/alpine3.15/cli/docker-php-source b/8.1/alpine3.15/cli/docker-php-source
similarity index 100%
rename from 8.1-rc/alpine3.15/cli/docker-php-source
rename to 8.1/alpine3.15/cli/docker-php-source
diff --git a/8.1-rc/alpine3.15/fpm/Dockerfile b/8.1/alpine3.15/fpm/Dockerfile
similarity index 96%
rename from 8.1-rc/alpine3.15/fpm/Dockerfile
rename to 8.1/alpine3.15/fpm/Dockerfile
index 127da423..09ae349d 100644
--- a/8.1-rc/alpine3.15/fpm/Dockerfile
+++ b/8.1/alpine3.15/fpm/Dockerfile
@@ -57,9 +57,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/alpine3.15/fpm/docker-php-entrypoint b/8.1/alpine3.15/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/alpine3.15/fpm/docker-php-entrypoint
rename to 8.1/alpine3.15/fpm/docker-php-entrypoint
diff --git a/8.1-rc/alpine3.15/fpm/docker-php-ext-configure b/8.1/alpine3.15/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/alpine3.15/fpm/docker-php-ext-configure
rename to 8.1/alpine3.15/fpm/docker-php-ext-configure
diff --git a/8.1-rc/alpine3.15/fpm/docker-php-ext-enable b/8.1/alpine3.15/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/alpine3.15/fpm/docker-php-ext-enable
rename to 8.1/alpine3.15/fpm/docker-php-ext-enable
diff --git a/8.1-rc/alpine3.15/fpm/docker-php-ext-install b/8.1/alpine3.15/fpm/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/alpine3.15/fpm/docker-php-ext-install
rename to 8.1/alpine3.15/fpm/docker-php-ext-install
diff --git a/8.1-rc/alpine3.15/fpm/docker-php-source b/8.1/alpine3.15/fpm/docker-php-source
similarity index 100%
rename from 8.1-rc/alpine3.15/fpm/docker-php-source
rename to 8.1/alpine3.15/fpm/docker-php-source
diff --git a/8.1-rc/bullseye/apache/Dockerfile b/8.1/bullseye/apache/Dockerfile
similarity index 97%
rename from 8.1-rc/bullseye/apache/Dockerfile
rename to 8.1/bullseye/apache/Dockerfile
index 1483d3d9..3cb531e3 100644
--- a/8.1-rc/bullseye/apache/Dockerfile
+++ b/8.1/bullseye/apache/Dockerfile
@@ -118,9 +118,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/bullseye/apache/apache2-foreground b/8.1/bullseye/apache/apache2-foreground
similarity index 100%
rename from 8.1-rc/bullseye/apache/apache2-foreground
rename to 8.1/bullseye/apache/apache2-foreground
diff --git a/8.1-rc/bullseye/apache/docker-php-entrypoint b/8.1/bullseye/apache/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/bullseye/apache/docker-php-entrypoint
rename to 8.1/bullseye/apache/docker-php-entrypoint
diff --git a/8.1-rc/bullseye/apache/docker-php-ext-configure b/8.1/bullseye/apache/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/bullseye/apache/docker-php-ext-configure
rename to 8.1/bullseye/apache/docker-php-ext-configure
diff --git a/8.1-rc/bullseye/apache/docker-php-ext-enable b/8.1/bullseye/apache/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/bullseye/apache/docker-php-ext-enable
rename to 8.1/bullseye/apache/docker-php-ext-enable
diff --git a/8.1-rc/bullseye/apache/docker-php-ext-install b/8.1/bullseye/apache/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/bullseye/apache/docker-php-ext-install
rename to 8.1/bullseye/apache/docker-php-ext-install
diff --git a/8.1-rc/bullseye/apache/docker-php-source b/8.1/bullseye/apache/docker-php-source
similarity index 100%
rename from 8.1-rc/bullseye/apache/docker-php-source
rename to 8.1/bullseye/apache/docker-php-source
diff --git a/8.1-rc/bullseye/cli/Dockerfile b/8.1/bullseye/cli/Dockerfile
similarity index 96%
rename from 8.1-rc/bullseye/cli/Dockerfile
rename to 8.1/bullseye/cli/Dockerfile
index c2bc9fb1..965523f6 100644
--- a/8.1-rc/bullseye/cli/Dockerfile
+++ b/8.1/bullseye/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/bullseye/cli/docker-php-entrypoint b/8.1/bullseye/cli/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/bullseye/cli/docker-php-entrypoint
rename to 8.1/bullseye/cli/docker-php-entrypoint
diff --git a/8.1-rc/bullseye/cli/docker-php-ext-configure b/8.1/bullseye/cli/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/bullseye/cli/docker-php-ext-configure
rename to 8.1/bullseye/cli/docker-php-ext-configure
diff --git a/8.1-rc/bullseye/cli/docker-php-ext-enable b/8.1/bullseye/cli/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/bullseye/cli/docker-php-ext-enable
rename to 8.1/bullseye/cli/docker-php-ext-enable
diff --git a/8.1-rc/bullseye/cli/docker-php-ext-install b/8.1/bullseye/cli/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/bullseye/cli/docker-php-ext-install
rename to 8.1/bullseye/cli/docker-php-ext-install
diff --git a/8.1-rc/bullseye/cli/docker-php-source b/8.1/bullseye/cli/docker-php-source
similarity index 100%
rename from 8.1-rc/bullseye/cli/docker-php-source
rename to 8.1/bullseye/cli/docker-php-source
diff --git a/8.1-rc/bullseye/fpm/Dockerfile b/8.1/bullseye/fpm/Dockerfile
similarity index 97%
rename from 8.1-rc/bullseye/fpm/Dockerfile
rename to 8.1/bullseye/fpm/Dockerfile
index 4ea65adb..170f0bb2 100644
--- a/8.1-rc/bullseye/fpm/Dockerfile
+++ b/8.1/bullseye/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/bullseye/fpm/docker-php-entrypoint b/8.1/bullseye/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/bullseye/fpm/docker-php-entrypoint
rename to 8.1/bullseye/fpm/docker-php-entrypoint
diff --git a/8.1-rc/bullseye/fpm/docker-php-ext-configure b/8.1/bullseye/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/bullseye/fpm/docker-php-ext-configure
rename to 8.1/bullseye/fpm/docker-php-ext-configure
diff --git a/8.1-rc/bullseye/fpm/docker-php-ext-enable b/8.1/bullseye/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/bullseye/fpm/docker-php-ext-enable
rename to 8.1/bullseye/fpm/docker-php-ext-enable
diff --git a/8.1-rc/bullseye/fpm/docker-php-ext-install b/8.1/bullseye/fpm/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/bullseye/fpm/docker-php-ext-install
rename to 8.1/bullseye/fpm/docker-php-ext-install
diff --git a/8.1-rc/bullseye/fpm/docker-php-source b/8.1/bullseye/fpm/docker-php-source
similarity index 100%
rename from 8.1-rc/bullseye/fpm/docker-php-source
rename to 8.1/bullseye/fpm/docker-php-source
diff --git a/8.1-rc/bullseye/zts/Dockerfile b/8.1/bullseye/zts/Dockerfile
similarity index 96%
rename from 8.1-rc/bullseye/zts/Dockerfile
rename to 8.1/bullseye/zts/Dockerfile
index 3928e0e1..a483d1a9 100644
--- a/8.1-rc/bullseye/zts/Dockerfile
+++ b/8.1/bullseye/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/bullseye/zts/docker-php-entrypoint b/8.1/bullseye/zts/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/bullseye/zts/docker-php-entrypoint
rename to 8.1/bullseye/zts/docker-php-entrypoint
diff --git a/8.1-rc/bullseye/zts/docker-php-ext-configure b/8.1/bullseye/zts/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/bullseye/zts/docker-php-ext-configure
rename to 8.1/bullseye/zts/docker-php-ext-configure
diff --git a/8.1-rc/bullseye/zts/docker-php-ext-enable b/8.1/bullseye/zts/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/bullseye/zts/docker-php-ext-enable
rename to 8.1/bullseye/zts/docker-php-ext-enable
diff --git a/8.1-rc/bullseye/zts/docker-php-ext-install b/8.1/bullseye/zts/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/bullseye/zts/docker-php-ext-install
rename to 8.1/bullseye/zts/docker-php-ext-install
diff --git a/8.1-rc/bullseye/zts/docker-php-source b/8.1/bullseye/zts/docker-php-source
similarity index 100%
rename from 8.1-rc/bullseye/zts/docker-php-source
rename to 8.1/bullseye/zts/docker-php-source
diff --git a/8.1-rc/buster/apache/Dockerfile b/8.1/buster/apache/Dockerfile
similarity index 97%
rename from 8.1-rc/buster/apache/Dockerfile
rename to 8.1/buster/apache/Dockerfile
index f528f67b..b26fbe9e 100644
--- a/8.1-rc/buster/apache/Dockerfile
+++ b/8.1/buster/apache/Dockerfile
@@ -118,9 +118,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/buster/apache/apache2-foreground b/8.1/buster/apache/apache2-foreground
similarity index 100%
rename from 8.1-rc/buster/apache/apache2-foreground
rename to 8.1/buster/apache/apache2-foreground
diff --git a/8.1-rc/buster/apache/docker-php-entrypoint b/8.1/buster/apache/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/buster/apache/docker-php-entrypoint
rename to 8.1/buster/apache/docker-php-entrypoint
diff --git a/8.1-rc/buster/apache/docker-php-ext-configure b/8.1/buster/apache/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/buster/apache/docker-php-ext-configure
rename to 8.1/buster/apache/docker-php-ext-configure
diff --git a/8.1-rc/buster/apache/docker-php-ext-enable b/8.1/buster/apache/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/buster/apache/docker-php-ext-enable
rename to 8.1/buster/apache/docker-php-ext-enable
diff --git a/8.1-rc/buster/apache/docker-php-ext-install b/8.1/buster/apache/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/buster/apache/docker-php-ext-install
rename to 8.1/buster/apache/docker-php-ext-install
diff --git a/8.1-rc/buster/apache/docker-php-source b/8.1/buster/apache/docker-php-source
similarity index 100%
rename from 8.1-rc/buster/apache/docker-php-source
rename to 8.1/buster/apache/docker-php-source
diff --git a/8.1-rc/buster/cli/Dockerfile b/8.1/buster/cli/Dockerfile
similarity index 96%
rename from 8.1-rc/buster/cli/Dockerfile
rename to 8.1/buster/cli/Dockerfile
index 59d0b588..725ddd7a 100644
--- a/8.1-rc/buster/cli/Dockerfile
+++ b/8.1/buster/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/buster/cli/docker-php-entrypoint b/8.1/buster/cli/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/buster/cli/docker-php-entrypoint
rename to 8.1/buster/cli/docker-php-entrypoint
diff --git a/8.1-rc/buster/cli/docker-php-ext-configure b/8.1/buster/cli/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/buster/cli/docker-php-ext-configure
rename to 8.1/buster/cli/docker-php-ext-configure
diff --git a/8.1-rc/buster/cli/docker-php-ext-enable b/8.1/buster/cli/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/buster/cli/docker-php-ext-enable
rename to 8.1/buster/cli/docker-php-ext-enable
diff --git a/8.1-rc/buster/cli/docker-php-ext-install b/8.1/buster/cli/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/buster/cli/docker-php-ext-install
rename to 8.1/buster/cli/docker-php-ext-install
diff --git a/8.1-rc/buster/cli/docker-php-source b/8.1/buster/cli/docker-php-source
similarity index 100%
rename from 8.1-rc/buster/cli/docker-php-source
rename to 8.1/buster/cli/docker-php-source
diff --git a/8.1-rc/buster/fpm/Dockerfile b/8.1/buster/fpm/Dockerfile
similarity index 97%
rename from 8.1-rc/buster/fpm/Dockerfile
rename to 8.1/buster/fpm/Dockerfile
index f92e680a..2a4b2da5 100644
--- a/8.1-rc/buster/fpm/Dockerfile
+++ b/8.1/buster/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/buster/fpm/docker-php-entrypoint b/8.1/buster/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/buster/fpm/docker-php-entrypoint
rename to 8.1/buster/fpm/docker-php-entrypoint
diff --git a/8.1-rc/buster/fpm/docker-php-ext-configure b/8.1/buster/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/buster/fpm/docker-php-ext-configure
rename to 8.1/buster/fpm/docker-php-ext-configure
diff --git a/8.1-rc/buster/fpm/docker-php-ext-enable b/8.1/buster/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/buster/fpm/docker-php-ext-enable
rename to 8.1/buster/fpm/docker-php-ext-enable
diff --git a/8.1-rc/buster/fpm/docker-php-ext-install b/8.1/buster/fpm/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/buster/fpm/docker-php-ext-install
rename to 8.1/buster/fpm/docker-php-ext-install
diff --git a/8.1-rc/buster/fpm/docker-php-source b/8.1/buster/fpm/docker-php-source
similarity index 100%
rename from 8.1-rc/buster/fpm/docker-php-source
rename to 8.1/buster/fpm/docker-php-source
diff --git a/8.1-rc/buster/zts/Dockerfile b/8.1/buster/zts/Dockerfile
similarity index 96%
rename from 8.1-rc/buster/zts/Dockerfile
rename to 8.1/buster/zts/Dockerfile
index 431084b9..a3541caa 100644
--- a/8.1-rc/buster/zts/Dockerfile
+++ b/8.1/buster/zts/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD
 
-ENV PHP_VERSION 8.1.0RC6
-ENV PHP_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz" PHP_ASC_URL="https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc"
-ENV PHP_SHA256="e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268"
+ENV PHP_VERSION 8.1.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.1.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.1.0.tar.xz.asc"
+ENV PHP_SHA256="a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc"
 
 RUN set -eux; \
 	\
diff --git a/8.1-rc/buster/zts/docker-php-entrypoint b/8.1/buster/zts/docker-php-entrypoint
similarity index 100%
rename from 8.1-rc/buster/zts/docker-php-entrypoint
rename to 8.1/buster/zts/docker-php-entrypoint
diff --git a/8.1-rc/buster/zts/docker-php-ext-configure b/8.1/buster/zts/docker-php-ext-configure
similarity index 100%
rename from 8.1-rc/buster/zts/docker-php-ext-configure
rename to 8.1/buster/zts/docker-php-ext-configure
diff --git a/8.1-rc/buster/zts/docker-php-ext-enable b/8.1/buster/zts/docker-php-ext-enable
similarity index 100%
rename from 8.1-rc/buster/zts/docker-php-ext-enable
rename to 8.1/buster/zts/docker-php-ext-enable
diff --git a/8.1-rc/buster/zts/docker-php-ext-install b/8.1/buster/zts/docker-php-ext-install
similarity index 100%
rename from 8.1-rc/buster/zts/docker-php-ext-install
rename to 8.1/buster/zts/docker-php-ext-install
diff --git a/8.1-rc/buster/zts/docker-php-source b/8.1/buster/zts/docker-php-source
similarity index 100%
rename from 8.1-rc/buster/zts/docker-php-source
rename to 8.1/buster/zts/docker-php-source
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index d8d3f31e..366261aa 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -3,7 +3,7 @@ set -Eeuo pipefail
 
 declare -A aliases=(
 	[7.4]='7'
-	[8.0]='8 latest'
+	[8.1]='8 latest'
 )
 
 defaultDebianSuite='bullseye'
diff --git a/versions.json b/versions.json
index 803fbefb..64ec06c6 100644
--- a/versions.json
+++ b/versions.json
@@ -66,11 +66,11 @@
     ],
     "version": "8.0.13"
   },
-  "8.1-rc": {
-    "ascUrl": "https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz.asc",
+  "8.1": {
+    "ascUrl": "https://www.php.net/distributions/php-8.1.0.tar.xz.asc",
     "gpgKeys": "528995BFEDFBA7191D46839EF9BA0ADA31CBD89E 39B641343D8C104B2B146DC3F9C39DC0B9698544 F1F692238FBC1666E5A5CCD4199F9DFEF6FFBAFD",
-    "sha256": "e7273a019aec824fd98e8f8ab071e7a2a37e681cc788a63c3092765dca479268",
-    "url": "https://downloads.php.net/~ramsey/php-8.1.0RC6.tar.xz",
+    "sha256": "a1317eff0723a2b3d3122bbfe107a1158570ea2822dc35a5fb360086db0f6bbc",
+    "url": "https://www.php.net/distributions/php-8.1.0.tar.xz",
     "variants": [
       "bullseye/cli",
       "bullseye/apache",
@@ -85,6 +85,6 @@
       "alpine3.14/cli",
       "alpine3.14/fpm"
     ],
-    "version": "8.1.0RC6"
+    "version": "8.1.0"
   }
 }