diff --git a/8.0-rc/alpine3.12/cli/Dockerfile b/8.0/alpine3.12/cli/Dockerfile
similarity index 95%
rename from 8.0-rc/alpine3.12/cli/Dockerfile
rename to 8.0/alpine3.12/cli/Dockerfile
index 0d99a74ac6..eaeed288b0 100644
--- a/8.0-rc/alpine3.12/cli/Dockerfile
+++ b/8.0/alpine3.12/cli/Dockerfile
@@ -58,9 +58,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
 
-ENV PHP_VERSION 8.0.0RC5
-ENV PHP_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz.asc"
-ENV PHP_SHA256="fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b"
+ENV PHP_VERSION 8.0.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.0.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.0.tar.xz.asc"
+ENV PHP_SHA256="b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb"
 
 RUN set -eux; \
 	\
diff --git a/8.0-rc/alpine3.12/cli/docker-php-entrypoint b/8.0/alpine3.12/cli/docker-php-entrypoint
similarity index 100%
rename from 8.0-rc/alpine3.12/cli/docker-php-entrypoint
rename to 8.0/alpine3.12/cli/docker-php-entrypoint
diff --git a/8.0-rc/alpine3.12/cli/docker-php-ext-configure b/8.0/alpine3.12/cli/docker-php-ext-configure
similarity index 100%
rename from 8.0-rc/alpine3.12/cli/docker-php-ext-configure
rename to 8.0/alpine3.12/cli/docker-php-ext-configure
diff --git a/8.0-rc/alpine3.12/cli/docker-php-ext-enable b/8.0/alpine3.12/cli/docker-php-ext-enable
similarity index 100%
rename from 8.0-rc/alpine3.12/cli/docker-php-ext-enable
rename to 8.0/alpine3.12/cli/docker-php-ext-enable
diff --git a/8.0-rc/alpine3.12/cli/docker-php-ext-install b/8.0/alpine3.12/cli/docker-php-ext-install
similarity index 100%
rename from 8.0-rc/alpine3.12/cli/docker-php-ext-install
rename to 8.0/alpine3.12/cli/docker-php-ext-install
diff --git a/8.0-rc/alpine3.12/cli/docker-php-source b/8.0/alpine3.12/cli/docker-php-source
similarity index 100%
rename from 8.0-rc/alpine3.12/cli/docker-php-source
rename to 8.0/alpine3.12/cli/docker-php-source
diff --git a/8.0-rc/alpine3.12/fpm/Dockerfile b/8.0/alpine3.12/fpm/Dockerfile
similarity index 96%
rename from 8.0-rc/alpine3.12/fpm/Dockerfile
rename to 8.0/alpine3.12/fpm/Dockerfile
index 6d340fdb70..a5f2b5e24a 100644
--- a/8.0-rc/alpine3.12/fpm/Dockerfile
+++ b/8.0/alpine3.12/fpm/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
 
-ENV PHP_VERSION 8.0.0RC5
-ENV PHP_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz.asc"
-ENV PHP_SHA256="fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b"
+ENV PHP_VERSION 8.0.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.0.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.0.tar.xz.asc"
+ENV PHP_SHA256="b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb"
 
 RUN set -eux; \
 	\
diff --git a/8.0-rc/alpine3.12/fpm/docker-php-entrypoint b/8.0/alpine3.12/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.0-rc/alpine3.12/fpm/docker-php-entrypoint
rename to 8.0/alpine3.12/fpm/docker-php-entrypoint
diff --git a/8.0-rc/alpine3.12/fpm/docker-php-ext-configure b/8.0/alpine3.12/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.0-rc/alpine3.12/fpm/docker-php-ext-configure
rename to 8.0/alpine3.12/fpm/docker-php-ext-configure
diff --git a/8.0-rc/alpine3.12/fpm/docker-php-ext-enable b/8.0/alpine3.12/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.0-rc/alpine3.12/fpm/docker-php-ext-enable
rename to 8.0/alpine3.12/fpm/docker-php-ext-enable
diff --git a/8.0-rc/alpine3.12/fpm/docker-php-ext-install b/8.0/alpine3.12/fpm/docker-php-ext-install
similarity index 100%
rename from 8.0-rc/alpine3.12/fpm/docker-php-ext-install
rename to 8.0/alpine3.12/fpm/docker-php-ext-install
diff --git a/8.0-rc/alpine3.12/fpm/docker-php-source b/8.0/alpine3.12/fpm/docker-php-source
similarity index 100%
rename from 8.0-rc/alpine3.12/fpm/docker-php-source
rename to 8.0/alpine3.12/fpm/docker-php-source
diff --git a/8.0-rc/buster/apache/Dockerfile b/8.0/buster/apache/Dockerfile
similarity index 97%
rename from 8.0-rc/buster/apache/Dockerfile
rename to 8.0/buster/apache/Dockerfile
index 16b8802dbc..912f89dcde 100644
--- a/8.0-rc/buster/apache/Dockerfile
+++ b/8.0/buster/apache/Dockerfile
@@ -121,9 +121,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
 
-ENV PHP_VERSION 8.0.0RC5
-ENV PHP_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz.asc"
-ENV PHP_SHA256="fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b"
+ENV PHP_VERSION 8.0.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.0.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.0.tar.xz.asc"
+ENV PHP_SHA256="b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb"
 
 RUN set -eux; \
 	\
diff --git a/8.0-rc/buster/apache/apache2-foreground b/8.0/buster/apache/apache2-foreground
similarity index 100%
rename from 8.0-rc/buster/apache/apache2-foreground
rename to 8.0/buster/apache/apache2-foreground
diff --git a/8.0-rc/buster/apache/docker-php-entrypoint b/8.0/buster/apache/docker-php-entrypoint
similarity index 100%
rename from 8.0-rc/buster/apache/docker-php-entrypoint
rename to 8.0/buster/apache/docker-php-entrypoint
diff --git a/8.0-rc/buster/apache/docker-php-ext-configure b/8.0/buster/apache/docker-php-ext-configure
similarity index 100%
rename from 8.0-rc/buster/apache/docker-php-ext-configure
rename to 8.0/buster/apache/docker-php-ext-configure
diff --git a/8.0-rc/buster/apache/docker-php-ext-enable b/8.0/buster/apache/docker-php-ext-enable
similarity index 100%
rename from 8.0-rc/buster/apache/docker-php-ext-enable
rename to 8.0/buster/apache/docker-php-ext-enable
diff --git a/8.0-rc/buster/apache/docker-php-ext-install b/8.0/buster/apache/docker-php-ext-install
similarity index 100%
rename from 8.0-rc/buster/apache/docker-php-ext-install
rename to 8.0/buster/apache/docker-php-ext-install
diff --git a/8.0-rc/buster/apache/docker-php-source b/8.0/buster/apache/docker-php-source
similarity index 100%
rename from 8.0-rc/buster/apache/docker-php-source
rename to 8.0/buster/apache/docker-php-source
diff --git a/8.0-rc/buster/cli/Dockerfile b/8.0/buster/cli/Dockerfile
similarity index 96%
rename from 8.0-rc/buster/cli/Dockerfile
rename to 8.0/buster/cli/Dockerfile
index 054d19a8cd..28b20cd91c 100644
--- a/8.0-rc/buster/cli/Dockerfile
+++ b/8.0/buster/cli/Dockerfile
@@ -60,9 +60,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
 
-ENV PHP_VERSION 8.0.0RC5
-ENV PHP_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz.asc"
-ENV PHP_SHA256="fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b"
+ENV PHP_VERSION 8.0.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.0.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.0.tar.xz.asc"
+ENV PHP_SHA256="b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb"
 
 RUN set -eux; \
 	\
diff --git a/8.0-rc/buster/cli/docker-php-entrypoint b/8.0/buster/cli/docker-php-entrypoint
similarity index 100%
rename from 8.0-rc/buster/cli/docker-php-entrypoint
rename to 8.0/buster/cli/docker-php-entrypoint
diff --git a/8.0-rc/buster/cli/docker-php-ext-configure b/8.0/buster/cli/docker-php-ext-configure
similarity index 100%
rename from 8.0-rc/buster/cli/docker-php-ext-configure
rename to 8.0/buster/cli/docker-php-ext-configure
diff --git a/8.0-rc/buster/cli/docker-php-ext-enable b/8.0/buster/cli/docker-php-ext-enable
similarity index 100%
rename from 8.0-rc/buster/cli/docker-php-ext-enable
rename to 8.0/buster/cli/docker-php-ext-enable
diff --git a/8.0-rc/buster/cli/docker-php-ext-install b/8.0/buster/cli/docker-php-ext-install
similarity index 100%
rename from 8.0-rc/buster/cli/docker-php-ext-install
rename to 8.0/buster/cli/docker-php-ext-install
diff --git a/8.0-rc/buster/cli/docker-php-source b/8.0/buster/cli/docker-php-source
similarity index 100%
rename from 8.0-rc/buster/cli/docker-php-source
rename to 8.0/buster/cli/docker-php-source
diff --git a/8.0-rc/buster/fpm/Dockerfile b/8.0/buster/fpm/Dockerfile
similarity index 96%
rename from 8.0-rc/buster/fpm/Dockerfile
rename to 8.0/buster/fpm/Dockerfile
index 817f42e40f..59fa3110e2 100644
--- a/8.0-rc/buster/fpm/Dockerfile
+++ b/8.0/buster/fpm/Dockerfile
@@ -62,9 +62,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
 
-ENV PHP_VERSION 8.0.0RC5
-ENV PHP_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz.asc"
-ENV PHP_SHA256="fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b"
+ENV PHP_VERSION 8.0.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.0.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.0.tar.xz.asc"
+ENV PHP_SHA256="b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb"
 
 RUN set -eux; \
 	\
diff --git a/8.0-rc/buster/fpm/docker-php-entrypoint b/8.0/buster/fpm/docker-php-entrypoint
similarity index 100%
rename from 8.0-rc/buster/fpm/docker-php-entrypoint
rename to 8.0/buster/fpm/docker-php-entrypoint
diff --git a/8.0-rc/buster/fpm/docker-php-ext-configure b/8.0/buster/fpm/docker-php-ext-configure
similarity index 100%
rename from 8.0-rc/buster/fpm/docker-php-ext-configure
rename to 8.0/buster/fpm/docker-php-ext-configure
diff --git a/8.0-rc/buster/fpm/docker-php-ext-enable b/8.0/buster/fpm/docker-php-ext-enable
similarity index 100%
rename from 8.0-rc/buster/fpm/docker-php-ext-enable
rename to 8.0/buster/fpm/docker-php-ext-enable
diff --git a/8.0-rc/buster/fpm/docker-php-ext-install b/8.0/buster/fpm/docker-php-ext-install
similarity index 100%
rename from 8.0-rc/buster/fpm/docker-php-ext-install
rename to 8.0/buster/fpm/docker-php-ext-install
diff --git a/8.0-rc/buster/fpm/docker-php-source b/8.0/buster/fpm/docker-php-source
similarity index 100%
rename from 8.0-rc/buster/fpm/docker-php-source
rename to 8.0/buster/fpm/docker-php-source
diff --git a/8.0-rc/buster/zts/Dockerfile b/8.0/buster/zts/Dockerfile
similarity index 96%
rename from 8.0-rc/buster/zts/Dockerfile
rename to 8.0/buster/zts/Dockerfile
index eb882eb31d..682dc61d51 100644
--- a/8.0-rc/buster/zts/Dockerfile
+++ b/8.0/buster/zts/Dockerfile
@@ -62,9 +62,9 @@ ENV PHP_LDFLAGS="-Wl,-O1 -pie"
 
 ENV GPG_KEYS 1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F
 
-ENV PHP_VERSION 8.0.0RC5
-ENV PHP_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz" PHP_ASC_URL="https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz.asc"
-ENV PHP_SHA256="fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b"
+ENV PHP_VERSION 8.0.0
+ENV PHP_URL="https://www.php.net/distributions/php-8.0.0.tar.xz" PHP_ASC_URL="https://www.php.net/distributions/php-8.0.0.tar.xz.asc"
+ENV PHP_SHA256="b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb"
 
 RUN set -eux; \
 	\
diff --git a/8.0-rc/buster/zts/docker-php-entrypoint b/8.0/buster/zts/docker-php-entrypoint
similarity index 100%
rename from 8.0-rc/buster/zts/docker-php-entrypoint
rename to 8.0/buster/zts/docker-php-entrypoint
diff --git a/8.0-rc/buster/zts/docker-php-ext-configure b/8.0/buster/zts/docker-php-ext-configure
similarity index 100%
rename from 8.0-rc/buster/zts/docker-php-ext-configure
rename to 8.0/buster/zts/docker-php-ext-configure
diff --git a/8.0-rc/buster/zts/docker-php-ext-enable b/8.0/buster/zts/docker-php-ext-enable
similarity index 100%
rename from 8.0-rc/buster/zts/docker-php-ext-enable
rename to 8.0/buster/zts/docker-php-ext-enable
diff --git a/8.0-rc/buster/zts/docker-php-ext-install b/8.0/buster/zts/docker-php-ext-install
similarity index 100%
rename from 8.0-rc/buster/zts/docker-php-ext-install
rename to 8.0/buster/zts/docker-php-ext-install
diff --git a/8.0-rc/buster/zts/docker-php-source b/8.0/buster/zts/docker-php-source
similarity index 100%
rename from 8.0-rc/buster/zts/docker-php-source
rename to 8.0/buster/zts/docker-php-source
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 71df4cd9ad..57879473e5 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -2,8 +2,9 @@
 set -Eeuo pipefail
 
 declare -A aliases=(
-	[7.4]='7 latest'
-	[8.0-rc]='rc'
+	[7.4]='7'
+	[8.0]='8 latest'
+	[8.1-rc]='rc'
 )
 
 defaultDebianSuite='buster'
diff --git a/versions.json b/versions.json
index d1868c4a93..e9b6707f8b 100644
--- a/versions.json
+++ b/versions.json
@@ -64,11 +64,11 @@
     ],
     "version": "7.4.13"
   },
-  "8.0-rc": {
-    "ascUrl": "https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz.asc",
+  "8.0": {
+    "ascUrl": "https://www.php.net/distributions/php-8.0.0.tar.xz.asc",
     "gpgKeys": "1729F83938DA44E27BA0F4D3DBDB397470D12172 BFDDD28642824F8118EF77909B67A5C12229118F",
-    "sha256": "fa2e98d8b42e497a45f491c4714f0a67f7d817ff2f7ab9aad09efb72d2a8c60b",
-    "url": "https://downloads.php.net/~carusogabriel/php-8.0.0RC5.tar.xz",
+    "sha256": "b5278b3eef584f0c075d15666da4e952fa3859ee509d6b0cc2ed13df13f65ebb",
+    "url": "https://www.php.net/distributions/php-8.0.0.tar.xz",
     "variants": [
       "buster/cli",
       "buster/apache",
@@ -77,6 +77,6 @@
       "alpine3.12/cli",
       "alpine3.12/fpm"
     ],
-    "version": "8.0.0RC5"
+    "version": "8.0.0"
   }
 }