diff --git a/.github/workflows/code-style.yml b/.github/workflows/code-style.yml
index 991ed77657..ec14aafc07 100644
--- a/.github/workflows/code-style.yml
+++ b/.github/workflows/code-style.yml
@@ -58,8 +58,6 @@ jobs:
 
             -   name: Composer install
                 uses: ramsey/composer-install@v3
-                with:
-                    composer-options: --ansi --prefer-dist
 
             -   name: Fix code style
                 if: env.writable == 1
@@ -104,8 +102,6 @@ jobs:
 
             -   name: Composer install
                 uses: ramsey/composer-install@v3
-                with:
-                    composer-options: --ansi --prefer-dist
 
             -   name: Fix code style
                 if: env.writable == 1
diff --git a/.github/workflows/remove-automerge-label.yml b/.github/workflows/remove-automerge-label.yml
index 4535f65e69..3169cd031d 100644
--- a/.github/workflows/remove-automerge-label.yml
+++ b/.github/workflows/remove-automerge-label.yml
@@ -11,7 +11,7 @@ jobs:
     remove-automerge-label:
         runs-on: ubuntu-latest
         timeout-minutes: 30
-        if: github.event.pull_request.merged == true
+        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'automerge')
         permissions:
             contents: none
 
diff --git a/.github/workflows/rexlint.yml b/.github/workflows/rexlint.yml
index 26da8868f0..a093621df2 100644
--- a/.github/workflows/rexlint.yml
+++ b/.github/workflows/rexlint.yml
@@ -27,8 +27,6 @@ jobs:
 
             -   name: Composer install
                 uses: ramsey/composer-install@v3
-                with:
-                    composer-options: --ansi --prefer-dist
 
             -   name: Run rexlint
                 run: vendor/bin/rexlint
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 41cc6b289a..4731b96178 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -15,8 +15,7 @@ permissions:
     contents: read
 
 jobs:
-    psalm-analysis:
-        name: psalm static code analysis
+    psalm:
         runs-on: ubuntu-latest
         timeout-minutes: 30
         if: github.event_name != 'repository_dispatch' || github.event.client_payload.slash_command.args.unnamed.all == '' || contains(github.event.client_payload.slash_command.args.unnamed.all, 'psalm')
@@ -62,8 +61,6 @@ jobs:
 
             -   name: Composer install
                 uses: ramsey/composer-install@v3
-                with:
-                    composer-options: --ansi --prefer-dist
 
             -   name: Run psalm analysis
                 if: github.event_name != 'repository_dispatch'
@@ -77,7 +74,7 @@ jobs:
 
             -   name: Git pull
                 if: failure() && steps.baseline.conclusion != 'skipped' && github.event_name == 'repository_dispatch'
-                run: git pull --rebase --autostash
+                run: git pull --ff-only --no-tags --depth=1
 
             -   name: Commit changed files
                 uses: stefanzweifel/git-auto-commit-action@v5
@@ -88,8 +85,7 @@ jobs:
                     commit_user_email: rex-bot@users.noreply.github.com
                     file_pattern: .tools/psalm/baseline.xml
 
-    psalm-taint-analysis:
-        name: psalm taint analysis
+    psalm-taint:
         runs-on: ubuntu-latest
         timeout-minutes: 30
         if: github.event.pull_request.draft == false && (github.event_name != 'repository_dispatch' || github.event.client_payload.slash_command.args.unnamed.all == '' || contains(github.event.client_payload.slash_command.args.unnamed.all, 'taint'))
@@ -135,8 +131,6 @@ jobs:
 
             -   name: Composer install
                 uses: ramsey/composer-install@v3
-                with:
-                    composer-options: --ansi --prefer-dist
 
             -   name: Run psalm taint analysis
                 if: github.event_name != 'repository_dispatch'
@@ -150,7 +144,7 @@ jobs:
 
             -   name: Git pull
                 if: failure() && steps.baseline.conclusion != 'skipped' && github.event_name == 'repository_dispatch'
-                run: git pull --rebase --autostash
+                run: git pull --ff-only --no-tags --depth=1
 
             -   name: Commit changed files
                 uses: stefanzweifel/git-auto-commit-action@v5
@@ -161,8 +155,7 @@ jobs:
                     commit_user_email: rex-bot@users.noreply.github.com
                     file_pattern: .tools/psalm/baseline-taint.xml
 
-    phpstan-analysis:
-        name: phpstan static code analysis
+    phpstan:
         runs-on: ubuntu-latest
         timeout-minutes: 30
         if: github.event_name != 'repository_dispatch' || github.event.client_payload.slash_command.args.unnamed.all == '' || contains(github.event.client_payload.slash_command.args.unnamed.all, 'phpstan')
@@ -182,7 +175,7 @@ jobs:
                         ${{ github.event.client_payload.github.payload.comment.body }}
                         https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
-            -   name: Checkout fork
+            -   name: Checkout
                 uses: actions/checkout@v4
                 if: github.event_name != 'repository_dispatch'
             -   name: Checkout on chat commnad
@@ -202,8 +195,6 @@ jobs:
 
             -   name: Composer install
                 uses: ramsey/composer-install@v3
-                with:
-                    composer-options: --ansi --prefer-dist
 
             -   name: Setup REDAXO
                 run: |
@@ -226,7 +217,7 @@ jobs:
 
             -   name: Git pull
                 if: failure() && steps.baseline.conclusion != 'skipped' && github.event_name == 'repository_dispatch'
-                run: git pull --rebase --autostash
+                run: git pull --ff-only --no-tags --depth=1
 
             -   name: Commit changed files
                 uses: stefanzweifel/git-auto-commit-action@v5
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index e4cc1b5a92..bf1e1fa890 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -57,7 +57,7 @@ jobs:
             -   name: Composer install
                 uses: ramsey/composer-install@v3
                 with:
-                    composer-options: --ansi --prefer-dist ${{ matrix.composer-flags }}
+                    composer-options: ${{ matrix.composer-flags }}
 
             -   name: Setup Problem Matchers for PHPUnit
                 run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
diff --git a/.tools/phpstan/baseline.neon b/.tools/phpstan/baseline.neon
index 4c93688968..8ca9d0c8f9 100644
--- a/.tools/phpstan/baseline.neon
+++ b/.tools/phpstan/baseline.neon
@@ -2094,4 +2094,3 @@ parameters:
 			message: "#^Method rex_var_test\\:\\:varCallback\\(\\) has parameter \\$params with no value type specified in iterable type array\\.$#"
 			count: 1
 			path: ../../redaxo/src/core/tests/var/var_test.php
-