diff --git a/.github/workflows/behat-test.yml b/.github/workflows/behat-test.yml
index 70a38b76..2f61fe18 100644
--- a/.github/workflows/behat-test.yml
+++ b/.github/workflows/behat-test.yml
@@ -81,6 +81,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Setup PHP for PHP-Scoper
+        uses: shivammathur/setup-php@v2
+        with:
+          tools: composer
+          php-version: 8.4
+          coverage: none
+
+      - name: Install PHP-Scoper
+        uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
+        with:
+          working-directory: "vendor-bin/php-scoper"
+          composer-options: '--prefer-dist'
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -95,6 +108,10 @@ jobs:
         with:
           composer-options: '--prefer-dist'
 
+      - name: Prefix Composer dependencies
+        run: |
+          composer prefix-dependencies
+
       - name: Make Composer packages available globally
         run: |
           echo "${PWD}/vendor/bin" >> $GITHUB_PATH
diff --git a/.github/workflows/php-lint.yml b/.github/workflows/php-lint.yml
index 677cea92..eefd25a5 100644
--- a/.github/workflows/php-lint.yml
+++ b/.github/workflows/php-lint.yml
@@ -48,11 +48,22 @@ jobs:
       - name: Validate Composer configuration
         run: composer validate
 
+      - name: Install PHP-Scoper
+        uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
+        with:
+          working-directory: "vendor-bin/php-scoper"
+          composer-options: '--prefer-dist'
+
+
       - name: Install PHP dependencies
         uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
         with:
           composer-options: '--prefer-dist'
 
+      - name: Prefix Composer dependencies
+        run: |
+          composer prefix-dependencies
+
       - name: PHP Lint
         run: composer lint
 
diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml
index b0bdeb10..cf72cf96 100644
--- a/.github/workflows/php-test.yml
+++ b/.github/workflows/php-test.yml
@@ -68,6 +68,19 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup PHP for PHP-Scoper
+        uses: shivammathur/setup-php@v2
+        with:
+          tools: composer
+          php-version: 8.4
+          coverage: none
+
+      - name: Install PHP-Scoper
+        uses: ramsey/composer-install@57532f8be5bda426838819c5ee9afb8af389d51a
+        with:
+          working-directory: "vendor-bin/php-scoper"
+          composer-options: '--prefer-dist'
+
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
@@ -77,6 +90,10 @@ jobs:
         with:
           composer-options: '--prefer-dist'
 
+      - name: Prefix Composer dependencies
+        run: |
+          composer prefix-dependencies
+
       - name: Setup Node.js (.nvmrc)
         uses: actions/setup-node@v4
         with:
diff --git a/composer.json b/composer.json
index 3187f288..e8fe3bbf 100644
--- a/composer.json
+++ b/composer.json
@@ -67,7 +67,7 @@
     "bamarni-bin": {
       "bin-links": false,
       "target-directory": "vendor-bin",
-      "forward-command": true
+      "forward-command": false
     }
   },
   "scripts": {
@@ -79,12 +79,6 @@
     "phpstan": "phpstan analyse --memory-limit=2048M",
     "prepare-behat-tests": "install-package-tests",
     "test": "phpunit",
-    "post-install-cmd": [
-      "@prefix-dependencies"
-    ],
-    "post-update-cmd": [
-      "@prefix-dependencies"
-    ],
     "prefix-dependencies": [
       "vendor-bin/php-scoper/vendor/bin/php-scoper add-prefix --output-dir=./vendor-prefixed --force --quiet",
       "echo '{ \"autoload\": { \"classmap\": [\"\"] } }' > ./vendor-prefixed/composer.json",