diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index d3ead8a..83961bc 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -135,11 +135,7 @@ jobs:
             all-tools-${{ github.sha }}-
             all-tools-
       - name: Code style check
-        uses: docker://phpdoc/phpcs-ga:latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: -d memory_limit=1024M
+        uses: phpDocumentor/coding-standard@v1.0.0
 
   phpstan:
     runs-on: ubuntu-latest
diff --git a/Makefile b/Makefile
index b83dd98..bdeae3d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,11 @@ setup: install-phive
 
 .PHONY: phpcs
 phpcs:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpcs-ga:latest -d memory_limit=1024M
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpcs-ga:v1.0.0 -s
+
+.PHONY: phpcbf
+phpcbf:
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpcs-ga:v1.0.0 phpcbf
 
 .PHONY: phpstan
 phpstan:
@@ -25,7 +29,7 @@ psalm:
 
 .PHONY: test
 test:
-	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.2 tools/phpunit
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.4-pcov tools/phpunit
 
 .PHONY: pre-commit-test
 pre-commit-test: test phpcs phpstan psalm
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index c030e8d..1cb3002 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -6,25 +6,11 @@
     <file>tests/unit</file>
     <exclude-pattern>*/tests/unit/Types/ContextFactoryTest.php</exclude-pattern>
     <arg value="p"/>
-    <rule ref="PSR2">
-        <include-pattern>*\.php</include-pattern>
-    </rule>
 
-    <rule ref="Doctrine">
-        <exclude name="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint.UselessDocComment" />
-    </rule>
-
-    <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
-        <exclude-pattern>*/src/*_.php</exclude-pattern>
+    <rule ref="phpDocumentor">
     </rule>
 
     <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix">
         <exclude-pattern>*/src/*/Abstract*.php</exclude-pattern>
     </rule>
-
-    <rule ref="Generic.Formatting.SpaceAfterNot">
-        <properties>
-            <property name="spacing" value="0" />
-        </properties>
-    </rule>
 </ruleset>