diff --git a/README.md b/README.md
index dbcf2de..75beea5 100644
--- a/README.md
+++ b/README.md
@@ -4,50 +4,50 @@ Development and Production-ready PHP Images for Docker
 
 **Special thanks to [@mlocati](https://github.com/mlocati) for creating the fantastic [`mlocati/docker-php-extension-installer`](https://github.com/mlocati/docker-php-extension-installer) tool, which made all of this possible!**
 
-> **Supported versions: [`8.4-rc`](#-use-php-84-rc-image-in-dockerfile), [`8.3`](#-use-php-83-image-in-dockerfile), [`8.2`](#-use-php-82-image-in-dockerfile), [`8.1`](#-use-php-81-image-in-dockerfile), [`8.0`](#-use-php-80-image-in-dockerfile), [`7.4`](#-use-php-74-image-in-dockerfile), [`7.3`](#-use-php-73-image-in-dockerfile)**
+> **Supported versions: [`8.4`](#-use-php-84-image-in-dockerfile), [`8.3`](#-use-php-83-image-in-dockerfile), [`8.2`](#-use-php-82-image-in-dockerfile), [`8.1`](#-use-php-81-image-in-dockerfile), [`8.0`](#-use-php-80-image-in-dockerfile), [`7.4`](#-use-php-74-image-in-dockerfile), [`7.3`](#-use-php-73-image-in-dockerfile)**
 
-### PHP 8.4-rc
+### PHP 8.4
 
-#### ![Code](resource/icons/code.svg) Use `PHP 8.4-rc` image in Dockerfile
+#### ![Code](resource/icons/code.svg) Use `PHP 8.4` image in Dockerfile
 
 ```Dockerfile
-FROM ghcr.io/ghostwriter/php:8.4-rc # 8.4-rc-cli with additional development tools
+FROM ghcr.io/ghostwriter/php:8.4 # 8.4-cli with additional development tools
 ```
 ```Dockerfile
-FROM ghcr.io/ghostwriter/php:8.4-rc-cli
+FROM ghcr.io/ghostwriter/php:8.4-cli
 ```
 ```Dockerfile
-FROM ghcr.io/ghostwriter/php:8.4-rc-fpm
+FROM ghcr.io/ghostwriter/php:8.4-fpm
 ```
 ```Dockerfile
-FROM ghcr.io/ghostwriter/php:8.4-rc-zts
+FROM ghcr.io/ghostwriter/php:8.4-zts
 ```
 
-#### ![Terminal](resource/icons/terminal.svg) Pull & Run `PHP 8.4-rc` image from the command line
+#### ![Terminal](resource/icons/terminal.svg) Pull & Run `PHP 8.4` image from the command line
 
 ```sh
-docker pull ghcr.io/ghostwriter/php:8.4-rc
+docker pull ghcr.io/ghostwriter/php:8.4
 ```
 ```sh
-docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc vendor/bin/phpunit
+docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4 vendor/bin/phpunit
 ```
 ```sh
-docker pull ghcr.io/ghostwriter/php:8.4-rc-cli
+docker pull ghcr.io/ghostwriter/php:8.4-cli
 ```
 ```sh
-docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc-cli vendor/bin/phpunit
+docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-cli vendor/bin/phpunit
 ```
 ```sh
-docker pull ghcr.io/ghostwriter/php:8.4-rc-fpm
+docker pull ghcr.io/ghostwriter/php:8.4-fpm
 ```
 ```sh
-docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc-fpm vendor/bin/phpunit
+docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-fpm vendor/bin/phpunit
 ```
 ```sh
-docker pull ghcr.io/ghostwriter/php:8.4-rc-zts
+docker pull ghcr.io/ghostwriter/php:8.4-zts
 ```
 ```sh
-docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-rc-zts vendor/bin/phpunit
+docker run -it --rm -v $PWD:/opt/app -w /opt/app ghcr.io/ghostwriter/php:8.4-zts vendor/bin/phpunit
 ```
 
 
diff --git a/coverage.php b/coverage.php
index 4e7e519..39a571c 100644
--- a/coverage.php
+++ b/coverage.php
@@ -1,5 +1,7 @@
 <?php
 
-$phpVersion = \PHP_MAJOR_VERSION . '.' . \PHP_MINOR_VERSION;
+$pcov = \PHP_VERSION_ID >= 80400
+        ? 'krakjoe/pcov@7d764c7c2555e8287351961d72be3ebec4d8743f'
+        : 'pcov';
 
-echo $phpVersion === '8.4' ? 'krakjoe/pcov@7d764c7c2555e8287351961d72be3ebec4d8743f' : 'pcov';
+echo $pcov;
diff --git a/matrix.php b/matrix.php
index 53aeff9..3dda31c 100644
--- a/matrix.php
+++ b/matrix.php
@@ -1,12 +1,12 @@
 <?php
 
-$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc'];
+$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4', 'master'];
 
 \arsort($versions);
 
 $result = \json_encode([
-    'dev' => ['8.4-rc'],
-    'latest' => ['8.3'],
+    'dev' => ['master'],
+    'latest' => ['8.4'],
     'version' => \array_values($versions),
     'variant' => ['cli', 'fpm', 'zts'],
 ]);
diff --git a/update-readme.php b/update-readme.php
index 3ca6cf4..b1ed1cd 100644
--- a/update-readme.php
+++ b/update-readme.php
@@ -2,20 +2,18 @@
 
 declare(strict_types=1);
 
-$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc'];
+$versions = ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'];
 
 \arsort($versions);
 
-$dev = '8.4-rc';
-$latest = '8.3';
-
+$dev = '8.5';
+$latest = '8.4';
 $variants = ['cli', 'fpm', 'zts'];
-
 $extensions = [
-    //    'database' => ['pgsql'],
+    //    'database' => ['mysql','pgsql'],
     'code-coverage' => ['pcov'],
     'extension' => [
-        //    'swoole',
+        //    'openswoole',
         //    'roadrunner',
         //    'frankenphp'
     ],