diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
index a186ba3..914face 100644
--- a/.github/workflows/coding-standards.yml
+++ b/.github/workflows/coding-standards.yml
@@ -21,14 +21,9 @@ on:
 
 jobs:
   coding-standards:
-    name: "Coding Standards"
+    name: "Coding Standards (PHP: ${{ inputs.php-version }})"
     runs-on: "ubuntu-22.04"
 
-    strategy:
-      matrix:
-        php-version:
-          - "${{ inputs.php-version }}"
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -37,7 +32,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ inputs.php-version }}"
           tools: "cs2pr"
 
       - name: "Set COMPOSER_ROOT_VERSION"
diff --git a/.github/workflows/composer-lint.yml b/.github/workflows/composer-lint.yml
index ef6f147..064c2a0 100644
--- a/.github/workflows/composer-lint.yml
+++ b/.github/workflows/composer-lint.yml
@@ -12,14 +12,9 @@ on:
 
 jobs:
   composer-lint:
-    name: "Composer Lint"
+    name: "Composer Lint (PHP: ${{ inputs.php-version }})"
     runs-on: "ubuntu-22.04"
 
-    strategy:
-      matrix:
-        php-version:
-          - "${{ inputs.php-version }}"
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -28,7 +23,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ inputs.php-version }}"
           tools: composer:v2, composer-normalize:2
         env:
           COMPOSER_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 5a01c66..432b06d 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -9,11 +9,6 @@ jobs:
     name: "phpDocumentor Guides"
     runs-on: "ubuntu-22.04"
 
-    strategy:
-      matrix:
-        php-version:
-          - "8.3" # Use the same version as in doctrine/doctrine-website
-
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v4"
@@ -22,7 +17,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "${{ matrix.php-version }}"
+          php-version: "8.3" # Use the same version as in doctrine/doctrine-website
           tools: "cs2pr"
 
       # Some of our dependencies have supported branches where they still need
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 391797b..9e6f4d8 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -21,14 +21,9 @@ on:
 
 jobs:
   phpstan:
-    name: "PHPStan"
+    name: "PHPStan (PHP: ${{ inputs.php-version }})"
     runs-on: "ubuntu-22.04"
 
-    strategy:
-      matrix:
-        php-version:
-          - "${{ inputs.php-version }}"
-
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -37,7 +32,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ inputs.php-version }}"
 
       - name: "Set COMPOSER_ROOT_VERSION"
         run: |
@@ -54,14 +49,9 @@ jobs:
         run: "vendor/bin/phpstan analyse -v"
 
   psalm:
-    name: "Psalm"
+    name: "Psalm (PHP: ${{ inputs.php-version }})"
     runs-on: "ubuntu-22.04"
 
-    strategy:
-      matrix:
-        php-version:
-          - "${{ inputs.php-version }}"
-
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -70,7 +60,7 @@ jobs:
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "${{ matrix.php-version }}"
+          php-version: "${{ inputs.php-version }}"
 
       - name: "Set COMPOSER_ROOT_VERSION"
         run: |
diff --git a/workflow-templates/coding-standards.yml b/workflow-templates/coding-standards.yml
index a7f66f9..9c565c3 100644
--- a/workflow-templates/coding-standards.yml
+++ b/workflow-templates/coding-standards.yml
@@ -8,7 +8,7 @@ on:
     paths:
       - ".github/workflows/coding-standards.yml"
       - "composer.*"
-      - "src/**" # but some packages use lib
+      - "src/**"
       - "phpcs.xml.dist"
       - "tests/**"
   push:
@@ -17,7 +17,7 @@ on:
     paths:
       - ".github/workflows/coding-standards.yml"
       - "composer.*"
-      - "src/**" # but some packages use lib
+      - "src/**"
       - "phpcs.xml.dist"
       - "tests/**"
 
diff --git a/workflow-templates/continuous-integration.yml b/workflow-templates/continuous-integration.yml
index 6a0b445..18bce20 100644
--- a/workflow-templates/continuous-integration.yml
+++ b/workflow-templates/continuous-integration.yml
@@ -7,7 +7,7 @@ on:
     paths:
       - ".github/workflows/continuous-integration.yml"
       - "composer.*"
-      - "src/**" # but some packages use lib
+      - "src/**"
       - "phpunit.xml.dist"
       - "tests/**"
   push:
@@ -16,7 +16,7 @@ on:
     paths:
       - ".github/workflows/continuous-integration.yml"
       - "composer.*"
-      - "src/**" # but some packages use lib
+      - "src/**"
       - "phpunit.xml.dist"
       - "tests/**"
 
diff --git a/workflow-templates/static-analysis.yml b/workflow-templates/static-analysis.yml
index f59905f..3d15207 100644
--- a/workflow-templates/static-analysis.yml
+++ b/workflow-templates/static-analysis.yml
@@ -8,7 +8,7 @@ on:
     paths:
       - ".github/workflows/static-analysis.yml"
       - "composer.*"
-      - "src/**" # but some packages use lib
+      - "src/**"
       - "phpstan*"
       - "psalm*"
       - "tests/**"
@@ -18,7 +18,7 @@ on:
     paths:
       - ".github/workflows/static-analysis.yml"
       - "composer.*"
-      - "src/**" # but some packages use lib
+      - "src/**"
       - "phpstan*"
       - "psalm*"
       - "tests/**"