diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bf653ef..1707c57 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -22,6 +22,8 @@ jobs:
     strategy:
       matrix:
         include:
+          - php-version: "8.4"
+            architeture: "arm64,amd64"
           - php-version: "8.3"
             architeture: "arm64,amd64"
           - php-version: "8.2"
diff --git a/.run/Build PHP 8.4 base.run.xml b/.run/Build PHP 8.4 base.run.xml
new file mode 100644
index 0000000..4e0d194
--- /dev/null
+++ b/.run/Build PHP 8.4 base.run.xml	
@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build PHP 8.4 base" type="docker-deploy" factoryName="docker-image" server-name="Docker">
+    <deployment type="docker-image">
+      <settings>
+        <option name="imageTag" value="byjg/k8s-ci" />
+        <option name="command" value="python3 build.py 8.4 --arch amd64 --build-base --debug" />
+        <option name="containerName" value="build-84" />
+        <option name="commandLineOptions" value="-it  --privileged -w /work" />
+        <option name="volumeBindings">
+          <list>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/work" />
+              <option name="hostPath" value="$PROJECT_DIR$" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/var/lib/containers" />
+              <option name="hostPath" value="/tmp/z" />
+            </DockerVolumeBindingImpl>
+          </list>
+        </option>
+      </settings>
+    </deployment>
+    <method v="2">
+      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Clean up Containers" run_configuration_type="ShConfigurationType" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index 9ce9a7f..a3fb062 100644
--- a/README.md
+++ b/README.md
@@ -24,9 +24,10 @@ The PHP images are ready to use in:
 
 | Version | Latest Version | Monthly Builds | Alpine Version |
 |:-------:|:--------------:|:--------------:|:--------------:|
-| **8.3** |   **8.3.8**    |    **yes**     |    **edge**    |
-| **8.2** |   **8.2.20**   |    **yes**     |    **3.20**    |
-| **8.1** |   **8.1.29**   |    **yes**     |    **3.19**    |      
+| **8.4** | **8.4.0 rc2**  |    **yes**     |    **edge**    |
+| **8.3** |   **8.3.13**   |    **yes**     |    **edge**    |
+| **8.2** |   **8.2.24**   |    **yes**     |    **3.20**    |
+|   8.1   |     8.1.29     |       -        |      3.19      |      
 |   8.0   |     8.0.30     |       -        |      3.16      |     
 |   7.4   |     7.4.33     |       -        |      3.15      |    
 |   7.3   |     7.3.33     |       -        |      3.12      |   
diff --git a/config/php-8.4.yml b/config/php-8.4.yml
new file mode 100644
index 0000000..ad0513a
--- /dev/null
+++ b/config/php-8.4.yml
@@ -0,0 +1,91 @@
+image:
+  default: alpine:edge
+
+repositories:
+  - https://dl-cdn.alpinelinux.org/alpine/edge/testing
+
+version:
+  major: 8
+  minor: 4
+  suffix: 84
+
+extensions:
+  - bcmath
+  - common
+  - ctype
+  - curl
+  - dba
+  - dom
+  - exif
+  - ftp
+  - gd
+  - gettext
+  - iconv
+  - intl
+  - fileinfo
+  - json
+  - mbstring
+  - mysqli
+  - mysqlnd
+  - openssl
+  - pcntl
+  - pdo
+  - pdo_dblib
+  - pdo_mysql
+  - pdo_pgsql
+  - pdo_sqlite
+  - pear
+#  - pecl-mcrypt
+  - pecl-memcached
+  - pecl-mongodb
+  - pecl-xdebug
+  - pecl-yaml
+  - phar
+  - posix
+  - redis
+  - session
+  - shmop
+  - simplexml
+  - soap
+  - sockets
+  - sqlite3
+  - tokenizer
+  - xml
+  - xmlreader
+  - xmlwriter
+  - xsl
+  - zip
+  - zlib
+
+pecl:
+  - name: xdebug
+    install: False
+    zend: True
+    config:
+      - xdebug.remote_port=9001
+
+composer:
+  packages:
+    - phpunit/phpunit:*
+    - squizlabs/php_codesniffer:*
+    - phpmd/phpmd:@stable
+  links:
+    - phpunit
+    - phpcs
+    - phpbcbf
+    - phpmd
+
+peclBuildPackages:
+  - autoconf
+  - build-base
+  - cyrus-sasl-dev
+  - gcc
+  - libtool
+  - make
+  - openssl-dev
+  - zlib-dev
+
+additionalPackages:
+  - libssl1.1
+  - libcrypto1.1
+  - python3
\ No newline at end of file