diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 976c808..ae59d61 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,34 +9,6 @@ on:
       - master
 
 jobs:
-  coding-standards:
-    name: Coding Standards
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install PHP
-        uses: shivammathur/setup-php@2.9.0
-        with:
-          php-version: '8.3'
-          coverage: none
-          extensions: mbstring
-          tools: composer-normalize, php-cs-fixer
-
-      - name: Validate composer.json
-        run: >-
-          composer validate --strict
-
-      - name: Normalize composer.json
-        run: >-
-          composer-normalize --dry-run
-
-      - name: Check code style
-        run: >-
-          php-cs-fixer check
 
   static-code-analysis:
     name: Static Code Analysis
@@ -48,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install PHP
-        uses: shivammathur/setup-php@2.9.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: '8.3'
           coverage: none
@@ -66,6 +38,17 @@ jobs:
         run: >-
           composer run static-analysis
 
+  php-cs-fixer:
+    name: PHP Code Style Fixer
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check code style
+        uses: docker://oskarstark/php-cs-fixer-ga
+
   roave-backwards-compatibility-check:
     name: Roave Backwards Compatibility Check
 
@@ -93,23 +76,26 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Install PHP
-        uses: shivammathur/setup-php@2.9.0
+        uses: shivammathur/setup-php@v2
         with:
+          php-version: "${{ matrix.php-version }}"
           coverage: none
           extensions: mbstring
-          php-version: "${{ matrix.php-version }}"
+          tools: phpunit:8
 
-      - name: Install dependencies with composer
-        run: "composer update --no-interaction --no-progress"
+      - name: Install dependencies
+        run: composer install
 
       - name: Run unit tests
-        run: "vendor/bin/phpunit"
+        run: phpunit
 
   windows-tests:
     name: Windows tests
@@ -119,21 +105,22 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.3"
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Install PHP
-        uses: shivammathur/setup-php@2.9.0
+        uses: shivammathur/setup-php@v2
         with:
+          php-version: "${{ matrix.php-version }}"
           coverage: none
           extensions: mbstring
-          php-version: "${{ matrix.php-version }}"
+          tools: phpunit:8
 
-      - name: Install dependencies with composer
-        run: "composer update --no-interaction --no-progress"
+      - name: Install dependencies
+        run: composer install
 
       - name: Run unit tests
-        run: "vendor/bin/phpunit tests/AssertTest.php"
+        run: phpunit