diff --git a/bin/generate.sh b/bin/generate.sh
index da0cc18..a8fa2f0 100755
--- a/bin/generate.sh
+++ b/bin/generate.sh
@@ -5,7 +5,7 @@
 #
 
 # PHP Versions that will be generated
-php_versions=( "8.3" "8.2" "8.1" )
+php_versions=( "8.4" "8.3" "8.2" "8.1" )
 
 # PHP variants that will be generated for each PHP version
 # final source image will be generated as follow: php:7.2-cli, php:7-2-apache and php:7.2-fpm
@@ -15,6 +15,7 @@ php_docker_suffix=( "cli" "apache" "fpm" )
 # PHP_VERSION => XDEBUG_VERSION
 declare -A xdebug_versions
 xdebug_versions=(
+    ["8.4"]="xdebug-3.4.5"
     ["8.3"]="xdebug-3.3.1"
     ["8.2"]="xdebug-3.3.1"
     ["8.1"]="xdebug-3.1.3"
diff --git a/build/8.4-apache/Dockerfile b/build/8.4-apache/Dockerfile
new file mode 100644
index 0000000..a0b7267
--- /dev/null
+++ b/build/8.4-apache/Dockerfile
@@ -0,0 +1,19 @@
+FROM php:8.4-apache
+LABEL org.opencontainers.image.authors="Przemek Szalko <przemek@mobtitude.com>"
+
+# php intl extension
+RUN apt-get update \
+    && apt-get install -y libicu-dev \
+    && docker-php-ext-install intl \
+    && docker-php-ext-install pdo_mysql \
+    && docker-php-source delete \
+    && apt-get remove -y libicu-dev \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pecl channel-update pecl.php.net \
+	&& pecl install xdebug-3.4.5 \
+	&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
diff --git a/build/8.4-apache/xdebug.ini b/build/8.4-apache/xdebug.ini
new file mode 100644
index 0000000..b04f78c
--- /dev/null
+++ b/build/8.4-apache/xdebug.ini
@@ -0,0 +1,14 @@
+[xdebug]
+zend_extension=xdebug.so
+
+xdebug.cli_color=0
+xdebug.show_local_vars=1
+xdebug.start_with_request=trigger
+
+xdebug.output_dir="/tmp"
+xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
+
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.4-cli/Dockerfile b/build/8.4-cli/Dockerfile
new file mode 100644
index 0000000..921b18b
--- /dev/null
+++ b/build/8.4-cli/Dockerfile
@@ -0,0 +1,19 @@
+FROM php:8.4-cli
+LABEL org.opencontainers.image.authors="Przemek Szalko <przemek@mobtitude.com>"
+
+# php intl extension
+RUN apt-get update \
+    && apt-get install -y libicu-dev \
+    && docker-php-ext-install intl \
+    && docker-php-ext-install pdo_mysql \
+    && docker-php-source delete \
+    && apt-get remove -y libicu-dev \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pecl channel-update pecl.php.net \
+	&& pecl install xdebug-3.4.5 \
+	&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
diff --git a/build/8.4-cli/xdebug.ini b/build/8.4-cli/xdebug.ini
new file mode 100644
index 0000000..b04f78c
--- /dev/null
+++ b/build/8.4-cli/xdebug.ini
@@ -0,0 +1,14 @@
+[xdebug]
+zend_extension=xdebug.so
+
+xdebug.cli_color=0
+xdebug.show_local_vars=1
+xdebug.start_with_request=trigger
+
+xdebug.output_dir="/tmp"
+xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
+
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+
diff --git a/build/8.4-fpm/Dockerfile b/build/8.4-fpm/Dockerfile
new file mode 100644
index 0000000..04b0cd8
--- /dev/null
+++ b/build/8.4-fpm/Dockerfile
@@ -0,0 +1,19 @@
+FROM php:8.4-fpm
+LABEL org.opencontainers.image.authors="Przemek Szalko <przemek@mobtitude.com>"
+
+# php intl extension
+RUN apt-get update \
+    && apt-get install -y libicu-dev \
+    && docker-php-ext-install intl \
+    && docker-php-ext-install pdo_mysql \
+    && docker-php-source delete \
+    && apt-get remove -y libicu-dev \
+    && apt-get autoremove -y \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN pecl channel-update pecl.php.net \
+	&& pecl install xdebug-3.4.5 \
+	&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
+COPY xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
diff --git a/build/8.4-fpm/xdebug.ini b/build/8.4-fpm/xdebug.ini
new file mode 100644
index 0000000..b04f78c
--- /dev/null
+++ b/build/8.4-fpm/xdebug.ini
@@ -0,0 +1,14 @@
+[xdebug]
+zend_extension=xdebug.so
+
+xdebug.cli_color=0
+xdebug.show_local_vars=1
+xdebug.start_with_request=trigger
+
+xdebug.output_dir="/tmp"
+xdebug.profiler_output_name="cachegrind.out.%H.%t.%p"
+
+xdebug.mode=develop,debug
+xdebug.discover_client_host=1
+xdebug.client_port=9000
+