diff --git a/images/8.0/Dockerfile b/images/8.0/Dockerfile
index b2b428d..3c224ec 100644
--- a/images/8.0/Dockerfile
+++ b/images/8.0/Dockerfile
@@ -130,7 +130,7 @@ RUN composer global config --no-plugins allow-plugins.ergebnis/composer-normaliz
 
 # Install infection/infection for mutation testing
 RUN pecl install xdebug-3.0.1 && docker-php-ext-enable xdebug
-RUN composer global config --no-plugins allow-plugins.infection/extension-installer true && composer global require infection/infection
+RUN composer global config --no-plugins allow-plugins.infection/extension-installer true && composer global require infection/infection:^0.27
 
 # Install Deptrac
 RUN mkdir -p /tools/deptrac && \
diff --git a/images/8.0/Dockerfile-alpine b/images/8.0/Dockerfile-alpine
index f038118..331292d 100644
--- a/images/8.0/Dockerfile-alpine
+++ b/images/8.0/Dockerfile-alpine
@@ -129,7 +129,7 @@ RUN composer global config --no-plugins allow-plugins.ergebnis/composer-normaliz
 
 # Install infection/infection for mutation testing
 RUN pecl install xdebug-3.0.1 && docker-php-ext-enable xdebug && docker-php-ext-configure zip && docker-php-ext-install zip
-RUN composer global config --no-plugins allow-plugins.infection/extension-installer true && composer global require infection/infection
+RUN composer global config --no-plugins allow-plugins.infection/extension-installer true && composer global require infection/infection:^0.27
 
 # Install Deptrac
 RUN mkdir -p /tools/deptrac && \
diff --git a/images/8.4/Dockerfile b/images/8.4/Dockerfile
new file mode 100644
index 0000000..86977fd
--- /dev/null
+++ b/images/8.4/Dockerfile
@@ -0,0 +1,157 @@
+FROM php:8.4.3
+
+# disable interactive functions
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get -y install --no-install-recommends libmcrypt-dev libreadline-dev zlib1g-dev libxml2-dev libzip-dev apt-utils curl git zip unzip libonig-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN docker-php-ext-install \
+    mbstring \
+    zip \
+    pdo_mysql \
+    mysqli \
+    xml \
+    bcmath
+
+RUN apt-get update && \
+    apt-get install -y zlib1g-dev libicu-dev g++ && \
+    rm -rf /var/lib/apt/lists/* && \
+    docker-php-ext-configure intl && \
+    docker-php-ext-install intl
+
+# Install PHP Code Sniffer
+RUN curl -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar -o phpcs && \
+    curl -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar -o phpcbf && \
+    chmod a+x phpcs && \
+    chmod a+x phpcbf && \
+    mv phpcs /usr/local/bin/phpcs && \
+    mv phpcbf /usr/local/bin/phpcbf
+
+# Install PHP Copy Paste Detector
+RUN curl -L https://phar.phpunit.de/phpcpd.phar -o phpcpd.phar && \
+    chmod +x phpcpd.phar && \
+    mv phpcpd.phar /usr/local/bin/phpcpd
+
+# Install PHP Dead Code Detector
+RUN curl -L https://phar.phpunit.de/phpdcd.phar -o phpdcd.phar && \
+    chmod +x phpdcd.phar && \
+    mv phpdcd.phar /usr/local/bin/phpdcd
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer -o composer-setup.php && \
+    php composer-setup.php --install-dir=/usr/local/bin --filename=composer
+
+# Install PhpMetrics
+RUN curl -OL https://github.com/phpmetrics/PhpMetrics/releases/download/v2.3.2/phpmetrics.phar && \
+    chmod +x phpmetrics.phar && mv phpmetrics.phar /usr/local/bin/phpmetrics
+
+# Install phpcs-security-audit v2 sniffes
+RUN mkdir -p /opt/phpcs/snifss/ && \
+    cd /opt/phpcs/snifss/ && \
+    git clone -b master https://github.com/FloeDesignTechnologies/phpcs-security-audit.git phpcs-security-audit && \
+    phpcs --config-set installed_paths /opt/phpcs/snifss/phpcs-security-audit/
+
+# Create tools folder
+RUN mkdir -p /tools
+
+# Set global bin-dir for composer packages
+ENV COMPOSER_BIN_DIR="/usr/local/bin"
+
+# Install Psecio Parse
+RUN mkdir -p /tools/psecio/parse && \
+    cd /tools/psecio/parse && \
+    composer require --dev psecio/parse && \
+    cd -
+
+# Install PHP-Var-Dump-Check
+RUN mkdir -p /tools/php-parallel-lint/php-var-dump-check && \
+    cd /tools/php-parallel-lint/php-var-dump-check && \
+    composer require --dev php-parallel-lint/php-var-dump-check && \
+    cd -
+
+# Install PHP-Parallel-Lint
+RUN mkdir -p /tools/php-parallel-lint/php-parallel-lint && \
+    cd /tools/php-parallel-lint/php-parallel-lint && \
+    composer require --dev php-parallel-lint/php-parallel-lint && \
+    cd -
+
+# Install PHP Assumptions
+RUN mkdir -p /tools/rskuipers/php-assumptions && \
+    cd /tools/rskuipers/php-assumptions && \
+    composer require --dev rskuipers/php-assumptions && \
+    cd -
+
+# Install churn-php
+RUN mkdir -p /tools/bmitch/churn-php && \
+    cd /tools/bmitch/churn-php && \
+    composer require --dev bmitch/churn-php && \
+    cd -
+
+# Install Fink
+RUN mkdir -p /tools/dantleech/fink && \
+    cd /tools/dantleech/fink && \
+    composer require --dev dantleech/fink && \
+    cd -
+
+# Install Pint
+RUN mkdir -p /tools/laravel/pint && \
+    cd /tools/laravel/pint && \
+    composer require laravel/pint --dev && \
+    cd -
+
+# Add update script
+ADD https://raw.githubusercontent.com/umutphp/php-docker-images-for-ci/master/scripts/update.sh /update.sh
+RUN chmod +x /update.sh
+
+# Add gitignore check script
+ADD https://raw.githubusercontent.com/umutphp/php-docker-images-for-ci/master/scripts/gitignore_checker.sh /gitignore_checker.sh
+RUN chmod +x /gitignore_checker.sh && ln -s /gitignore_checker.sh /usr/local/bin/gitignore_checker
+
+# Add merge conflict checker script
+ADD https://raw.githubusercontent.com/umutphp/php-docker-images-for-ci/master/scripts/merge_conflict_checker.sh /merge_conflict_checker.sh
+RUN chmod +x /merge_conflict_checker.sh && ln -s /merge_conflict_checker.sh /usr/local/bin/merge_conflict_checker
+
+# Install PHPMD
+RUN mkdir -p /tools/phpmd/phpmd && \
+    cd /tools/phpmd/phpmd && \
+    composer require --dev phpmd/phpmd && \
+    cd -
+
+# Install PHP_Testability
+RUN mkdir -p /tools/edsonmedina/php_testability && \
+    cd /tools/edsonmedina/php_testability && \
+    composer require --dev edsonmedina/php_testability:dev-master && \
+    cd -
+
+# Install composer-normalize
+RUN composer global config --no-plugins allow-plugins.ergebnis/composer-normalize true && composer global require ergebnis/composer-normalize
+
+# Install infection/infection for mutation testing
+RUN pecl install xdebug-3.3.0alpha3 && docker-php-ext-enable xdebug
+RUN composer global config --no-plugins allow-plugins.infection/extension-installer true && composer global require infection/infection
+
+# Install Deptrac
+RUN mkdir -p /tools/deptrac && \
+    curl -LS https://github.com/sensiolabs-de/deptrac/releases/download/0.6.0/deptrac.phar -o deptrac.phar && \
+    chmod +x deptrac.phar && mv deptrac.phar /tools/deptrac/deptrac
+
+# Install phpstan
+RUN mkdir -p /tools/phpstan/phpstan && \
+    cd /tools/phpstan/phpstan && \
+    composer require --dev phpstan/phpstan && \
+    cd -
+
+# Install local-php-security-checker
+RUN mkdir -p /tools/local-php-security-checker && \
+    cd /tools/local-php-security-checker && \
+    curl -L https://github.com/fabpot/local-php-security-checker/releases/download/v1.0.0/local-php-security-checker_1.0.0_linux_amd64 -o local-php-security-checker && \
+    chmod +x local-php-security-checker && \
+    mv local-php-security-checker /usr/local/bin/local-php-security-checker
+
+# Unset COMPOSER_BIN_DIR
+ENV COMPOSER_BIN_DIR="vendor/bin"
+
+# Unset the entry point
+ENTRYPOINT []
diff --git a/images/8.4/Dockerfile-alpine b/images/8.4/Dockerfile-alpine
new file mode 100644
index 0000000..0dc4bd1
--- /dev/null
+++ b/images/8.4/Dockerfile-alpine
@@ -0,0 +1,160 @@
+FROM php:8.4.3-alpine
+
+# disable interactive functions
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apk --no-cache add libzip-dev && \
+    apk --no-cache --update add --virtual .build-deps gcc make g++ zlib-dev libmcrypt-dev libxml2-dev libzip-dev curl git zip unzip oniguruma-dev autoconf && \
+    rm -rf /var/cache/apk/*
+
+RUN docker-php-ext-install \
+    mbstring \
+    zip \
+    pdo_mysql \
+    mysqli \
+    xml \
+    bcmath
+
+RUN apk add icu-dev && \
+    docker-php-ext-configure intl && \
+    docker-php-ext-install intl && \
+    rm -rf /var/cache/apk/*
+
+# Install PHP Code Sniffer
+RUN curl -L https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar -o phpcs && \
+    curl -L https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar -o phpcbf && \
+    chmod a+x phpcs && \
+    chmod a+x phpcbf && \
+    mv phpcs /usr/local/bin/phpcs && \
+    mv phpcbf /usr/local/bin/phpcbf
+
+# Install PHP Copy Paste Detector
+RUN curl -L https://phar.phpunit.de/phpcpd.phar -o phpcpd.phar && \
+    chmod +x phpcpd.phar && \
+    mv phpcpd.phar /usr/local/bin/phpcpd
+
+# Install PHP Dead Code Detector
+RUN curl -L https://phar.phpunit.de/phpdcd.phar -o phpdcd.phar && \
+    chmod +x phpdcd.phar && \
+    mv phpdcd.phar /usr/local/bin/phpdcd
+
+# Install Composer
+RUN curl -sS https://getcomposer.org/installer -o composer-setup.php && \
+    php composer-setup.php --install-dir=/usr/local/bin --filename=composer
+
+# Install PhpMetrics
+RUN curl -OL https://github.com/phpmetrics/PhpMetrics/releases/download/v2.3.2/phpmetrics.phar && \
+    chmod +x phpmetrics.phar && mv phpmetrics.phar /usr/local/bin/phpmetrics
+
+# Install phpcs-security-audit v2 sniffes
+RUN mkdir -p /opt/phpcs/snifss/ && \
+    cd /opt/phpcs/snifss/ && \
+    git clone -b master https://github.com/FloeDesignTechnologies/phpcs-security-audit.git phpcs-security-audit && \
+    phpcs --config-set installed_paths /opt/phpcs/snifss/phpcs-security-audit/
+
+# Create tools folder
+RUN mkdir -p /tools
+
+# Set global bin-dir for composer packages
+ENV COMPOSER_BIN_DIR="/usr/local/bin"
+
+# Install Psecio Parse
+RUN mkdir -p /tools/psecio/parse && \
+    cd /tools/psecio/parse && \
+    composer require --dev psecio/parse && \
+    cd -
+
+# Install PHP-Var-Dump-Check
+RUN mkdir -p /tools/php-parallel-lint/php-var-dump-check && \
+    cd /tools/php-parallel-lint/php-var-dump-check && \
+    composer require --dev php-parallel-lint/php-var-dump-check && \
+    cd -
+
+# Install PHP-Parallel-Lint
+RUN mkdir -p /tools/php-parallel-lint/php-parallel-lint && \
+    cd /tools/php-parallel-lint/php-parallel-lint && \
+    composer require --dev php-parallel-lint/php-parallel-lint && \
+    cd -
+
+# Install PHP Assumptions
+RUN mkdir -p /tools/rskuipers/php-assumptions && \
+    cd /tools/rskuipers/php-assumptions && \
+    composer require --dev rskuipers/php-assumptions && \
+    cd -
+
+# Install churn-php
+RUN mkdir -p /tools/bmitch/churn-php && \
+    cd /tools/bmitch/churn-php && \
+    composer require --dev bmitch/churn-php && \
+    cd -
+
+# Install Fink
+RUN mkdir -p /tools/dantleech/fink && \
+    cd /tools/dantleech/fink && \
+    composer require --dev dantleech/fink && \
+    cd -
+
+# Install Pint
+RUN mkdir -p /tools/laravel/pint && \
+    cd /tools/laravel/pint && \
+    composer require laravel/pint --dev && \
+    cd -
+
+# Add update script
+ADD https://raw.githubusercontent.com/umutphp/php-docker-images-for-ci/master/scripts/update.sh /update.sh
+RUN chmod +x /update.sh
+
+# Add gitignore check script
+ADD https://raw.githubusercontent.com/umutphp/php-docker-images-for-ci/master/scripts/gitignore_checker.sh /gitignore_checker.sh
+RUN chmod +x /gitignore_checker.sh && ln -s /gitignore_checker.sh /usr/local/bin/gitignore_checker
+
+# Add merge conflict checker script
+ADD https://raw.githubusercontent.com/umutphp/php-docker-images-for-ci/master/scripts/merge_conflict_checker.sh /merge_conflict_checker.sh
+RUN chmod +x /merge_conflict_checker.sh && ln -s /merge_conflict_checker.sh /usr/local/bin/merge_conflict_checker
+
+# Install PHPMD
+RUN mkdir -p /tools/phpmd/phpmd && \
+    cd /tools/phpmd/phpmd && \
+    composer require --dev phpmd/phpmd && \
+    cd -
+
+# Install PHP_Testability
+RUN mkdir -p /tools/edsonmedina/php_testability && \
+    cd /tools/edsonmedina/php_testability && \
+    composer require --dev edsonmedina/php_testability:dev-master && \
+    cd -
+
+# Install composer-normalize
+RUN composer global config --no-plugins allow-plugins.ergebnis/composer-normalize true && composer global require ergebnis/composer-normalize
+
+# Install infection/infection for mutation testing
+RUN apk add --update linux-headers && rm -rf /var/cache/apk/*
+RUN pecl install xdebug-3.3.0alpha3 && docker-php-ext-enable xdebug && docker-php-ext-configure zip && docker-php-ext-install zip
+RUN composer global config --no-plugins allow-plugins.infection/extension-installer true && composer global require infection/infection
+
+# Install Deptrac
+RUN mkdir -p /tools/deptrac && \
+    curl -LS https://github.com/sensiolabs-de/deptrac/releases/download/0.6.0/deptrac.phar -o deptrac.phar && \
+    chmod +x deptrac.phar && mv deptrac.phar /tools/deptrac/deptrac
+
+# Install phpstan
+RUN mkdir -p /tools/phpstan/phpstan && \
+    cd /tools/phpstan/phpstan && \
+    composer require --dev phpstan/phpstan && \
+    cd -
+
+# Remove build dependencies
+RUN apk del .build-deps
+
+# Install local-php-security-checker
+RUN mkdir -p /tools/local-php-security-checker && \
+    cd /tools/local-php-security-checker && \
+    curl -L https://github.com/fabpot/local-php-security-checker/releases/download/v1.0.0/local-php-security-checker_1.0.0_linux_amd64 -o local-php-security-checker && \
+    chmod +x local-php-security-checker && \
+    mv local-php-security-checker /usr/local/bin/local-php-security-checker
+
+# Unset COMPOSER_BIN_DIR
+ENV COMPOSER_BIN_DIR="vendor/bin"
+
+# Unset the entry point
+ENTRYPOINT []