diff --git a/.gitattributes b/.gitattributes
index 470a43a..652b304 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,5 +14,6 @@
 /docs               export-ignore
 /docker             export-ignore
 /docker-compose.yml export-ignore
+/tools export-ignore
 /Makefile export-ignore
 /phpstan.neon export-ignore
diff --git a/Makefile b/Makefile
index dd515f8..ae03b48 100644
--- a/Makefile
+++ b/Makefile
@@ -56,13 +56,14 @@ ti: vendor
 vendor:
 	$(COMPOSER) update $(DEPS_STRATEGY)
 
-PHP_CS_FIXER = docker pull cytopia/php-cs-fixer:latest-php7.4 && docker run --rm -t -v `pwd`:/data cytopia/php-cs-fixer:latest-php7.4
+PHP_CS_FIXER = docker-compose run --rm -T php tools/php-cs-fixer/vendor/bin/php-cs-fixer fix -vv --allow-risky=yes
 
 phpcs:
-	$(PHP_CS_FIXER) fix -vv --dry-run --allow-risky=yes
+	PHP_VERSION=7.4 docker-compose run --rm -T php composer require --working-dir=tools/php-cs-fixer friendsofphp/php-cs-fixer
+	PHP_VERSION=7.4 $(PHP_CS_FIXER) --dry-run
 
 phpcbf:
-	$(PHP_CS_FIXER) fix -vv --allow-risky=yes
+	$(PHP_CS_FIXER)
 
 phpstan: vendor
 	$(EXEC_PHP) vendor/bin/phpstan analyse src -c phpstan.neon -a vendor/autoload.php
diff --git a/tests/Spellchecker/IspellTest.php b/tests/Spellchecker/IspellTest.php
index f56b5e5..ed2e645 100644
--- a/tests/Spellchecker/IspellTest.php
+++ b/tests/Spellchecker/IspellTest.php
@@ -21,7 +21,7 @@ public function testSpellcheckFromFakeBinaries(): void
 
     public function testGetSupportedLanguagesFromFakeBinaries(): void
     {
-        $this->assertWorkingSupportedLanguages(self::FAKE_BINARIES_PATH, self:: FAKE_BINARIES_PATH);
+        $this->assertWorkingSupportedLanguages(self::FAKE_BINARIES_PATH, self::FAKE_BINARIES_PATH);
     }
 
     public function testBadCheckRequest(): void
diff --git a/tools/php-cs-fixer/.gitkeep b/tools/php-cs-fixer/.gitkeep
new file mode 100644
index 0000000..e69de29