diff --git a/.github/workflows/static-test.yml b/.github/workflows/static-test.yml
index 65b4030df053..a5a26f8c27c4 100644
--- a/.github/workflows/static-test.yml
+++ b/.github/workflows/static-test.yml
@@ -22,26 +22,40 @@ jobs:
     - uses: actions/checkout@main
       with:
         fetch-depth: 0
-    - name: set CI_BASE_BRANCH
+    - name: Set CI_BASE_BRANCH
       run: |
-          if [ -n "${{ github.base_ref }}" ]; then
-              echo "CI_BASE_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
-          elif [ -n "${{ github.event.merge_group.base_ref }}" ]; then
-              echo "CI_BASE_BRANCH=${{ github.event.merge_group.base_ref }}" | sed s.=refs/heads/.=. >> $GITHUB_ENV
-          fi
+        # Figure out the correct base branch to work on...
+
+        if [ -n "${{ github.base_ref }}" ]; then
+          echo "CI_BASE_BRANCH=${{ github.base_ref }}" >> $GITHUB_ENV
+        elif [ -n "${{ github.event.merge_group.base_ref }}" ]; then
+          echo "CI_BASE_BRANCH=${{ github.event.merge_group.base_ref }}" | sed s.=refs/heads/.=. >> $GITHUB_ENV
+        fi
+
+        echo "Base Branch: origin/$(grep '^CI_BASE_BRANCH=' $GITHUB_ENV | cut -d= -f2-)"
     - name: Setup git
       run: |
+        # Configuring and rebasing the repository...
+
+        # Name and E-Mail required for rebasing
+        git config user.name "statictester"
+        git config user.email "statictester@riot.invalid"
+
         # Note: CI_BASE_BRANCH is empty when not in a PR
         if [ -n "${CI_BASE_BRANCH}" ]; then
           git fetch origin ${CI_BASE_BRANCH}:${CI_BASE_BRANCH} --no-tags
+          echo "Rebasing PR branch onto origin/${CI_BASE_BRANCH}..."
+          git rebase origin/${CI_BASE_BRANCH}
         else
           git config diff.renameLimit 16384
         fi
         git config apply.whitespace nowarn
     - name: Fetch riot/static-test-tools Docker image
       run: docker pull riot/static-test-tools:latest
-    - name: Run static-tests
+    - name: Run static-tests on `riot/static-test-tools`
       run: |
+        # Start docker container and run tests...
+
         # Note: ${CI_BASE_BRANCH} is empty when not in a PR
         docker run --rm                             \
           -e CI_BASE_BRANCH                         \