diff --git a/.env b/.env
index d74b672..9be5fc1 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
-COMPOSER_VERSION=2.8.1
+COMPOSER_VERSION=2.8.3
 XDEBUG_VERSION=3.3.2
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index c686d7d..4ebd785 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php_version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+        php_version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/Makefile b/Makefile
index 4357cb7..14606a3 100644
--- a/Makefile
+++ b/Makefile
@@ -20,4 +20,7 @@ build-82:
 	cd ./v8.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.2 `pwd`
 
 build-83:
-	cd ./v8.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.3 `pwd`
+	cd ./v8.3 && docker build --build-arg composer_version=${composer_version} ---build-arg php_xdebug_version=${xdebug_version} -tag=php-for-dev:8.3 `pwd`
+
+build-84:
+	cd ./v8.4 && docker build --build-arg composer_version=${composer_version} ---build-arg php_xdebug_version=${xdebug_version} -tag=php-for-dev:8.4 `pwd` 
diff --git a/readme.md b/readme.md
index ab4088e..2b9498f 100644
--- a/readme.md
+++ b/readme.md
@@ -6,9 +6,10 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan
 
 #### Supported versions
 
-* php 8.3.12
-* php 8.2.24
-* php 8.1.30
+* php 8.4.1
+* php 8.3.14
+* php 8.2.26
+* php 8.1.31
 * php 8.0.30 **(latest)**
 * php 7.4.33
   * xdebug 3.1.6
diff --git a/v8.1/Dockerfile b/v8.1/Dockerfile
index 11f79fe..50ad9ef 100644
--- a/v8.1/Dockerfile
+++ b/v8.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1.30-alpine
+FROM php:8.1.31-alpine
 
 ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION=3.3.1
diff --git a/v8.2/Dockerfile b/v8.2/Dockerfile
index 32c9640..05798a3 100644
--- a/v8.2/Dockerfile
+++ b/v8.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.2.24-alpine
+FROM php:8.2.26-alpine
 
 ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION
diff --git a/v8.3/Dockerfile b/v8.3/Dockerfile
index 7525033..bd3c5f0 100644
--- a/v8.3/Dockerfile
+++ b/v8.3/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.3.12-alpine
+FROM php:8.3.14-alpine
 
 ARG COMPOSER_VERSION
 ARG PHP_XDEBUG_VERSION
diff --git a/v8.4/Dockerfile b/v8.4/Dockerfile
new file mode 100644
index 0000000..1d47cc7
--- /dev/null
+++ b/v8.4/Dockerfile
@@ -0,0 +1,30 @@
+FROM php:8.4.1-alpine
+
+ARG COMPOSER_VERSION
+ARG PHP_XDEBUG_VERSION
+
+RUN apk update && apk add --no-cache $PHPIZE_DEPS \
+    && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \
+        curl zip libzip-dev gmp-dev linux-headers \
+        imap-dev openssl-dev git zsh \
+    && docker-php-ext-configure gd --enable-gd \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
+    && docker-php-ext-install gd \
+    && docker-php-ext-configure bcmath && docker-php-ext-install bcmath \
+    && docker-php-ext-configure zip --with-zip && docker-php-ext-install zip \
+    && docker-php-ext-install gmp \
+    && PHP_OPENSSL=yes docker-php-ext-configure imap --with-imap-ssl \
+    && docker-php-ext-install imap \
+    && pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \
+    && apk del $PHPIZE_DEPS \
+        zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev
+
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php -- \
+        --filename=composer \
+        --version=${COMPOSER_VERSION} \
+        --install-dir=/usr/local/bin
+RUN mkdir -m 777 -p /var/composer/
+ENV COMPOSER_HOME /var/composer/