diff --git a/.github/workflows/__shared-ci.yml b/.github/workflows/__shared-ci.yml
index 27f6e4f..6db4c73 100644
--- a/.github/workflows/__shared-ci.yml
+++ b/.github/workflows/__shared-ci.yml
@@ -35,9 +35,6 @@ jobs:
       - name: 👕 Lint
         if: matrix.stable
         run: composer php-cs-fixer -- --format=checkstyle | tools/vendor/bin/cs2pr
-        env:
-          # FIXME: Remove this when PHP CS Fixer will support PHP 8.4
-          PHP_CS_FIXER_IGNORE_ENV: ${{ matrix.php-versions == '8.4' && '1' || '' }}
 
       - name: 🔬 Rector
         id: rector
diff --git a/.github/workflows/update-css-referential.yml b/.github/workflows/update-css-referential.yml
index 2d6adb1..e665afe 100644
--- a/.github/workflows/update-css-referential.yml
+++ b/.github/workflows/update-css-referential.yml
@@ -19,7 +19,7 @@ jobs:
       - name: ⚙️ Setup PHP, with composer and extensions
         uses: ./.github/workflows/actions/setup-php
         with:
-          php-version: 8.3
+          php-version: 8.4
 
       - name: Generate CSS Referential
         run: composer run-script generate-css-referentials
diff --git a/Makefile b/Makefile
index 05a2963..6ceee1b 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ generate-css-referentials: ## Generate referentials for given PHP version
 
 ## Run PHP for given version
 define run-php
-	@docker run -it --rm -v ${PWD}:${PWD} -e PHP_CS_FIXER_IGNORE_ENV=$(if $(filter 8.4,$(PHP_VERSION)),1,) -w ${PWD} "${IMAGE}" $(1)
+	@docker run -it --rm -v ${PWD}:${PWD} -w ${PWD} "${IMAGE}" $(1)
 endef
 
 #############################
diff --git a/tools/composer.json b/tools/composer.json
index f7a5faa..0a39d75 100644
--- a/tools/composer.json
+++ b/tools/composer.json
@@ -1,6 +1,6 @@
 {
   "require": {
-    "friendsofphp/php-cs-fixer": "^3.76",
+    "friendsofphp/php-cs-fixer": "^3.80",
     "phpstan/extension-installer": "^1.4",
     "phpstan/phpstan": "^2.1",
     "phpstan/phpstan-phpunit": "^2.0",