diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index 7d39fbdece..d1a9b3544d 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -323,6 +323,18 @@ jobs:
             - run: |
                   bash ./.github/scripts/Cygwin/build.sh
 
+    check-sign-off:
+        name: Write comment if unsigned commits found
+        if: github.event_name == 'pull_request'
+        runs-on: ubuntu-latest
+        env:
+            FORCE_COLOR: 1
+            runs-on: ubuntu-latest
+        steps:
+          - uses: live627/check-pr-signoff-action@v1
+            with:
+                token: ${{ secrets.GITHUB_TOKEN }}
+
     release:
         name: Release pushed tag
         runs-on: ubuntu-latest
@@ -336,6 +348,7 @@ jobs:
             - xserver-build-dragonflybsd
             - xserver-build-netbsd
             - xserver-build-cygwin
+            - check-sign-off
         steps:
             - name: Checkout
               uses: actions/checkout@v4
diff --git a/.github/workflows/pr-signoff-check.yml b/.github/workflows/pr-signoff-check.yml
deleted file mode 100644
index 3523d9a1e8..0000000000
--- a/.github/workflows/pr-signoff-check.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Check PR Sign-off
-
-on: [pull_request]
-
-jobs:
-  check-sign-off:
-    name: Write comment if unsigned commits found
-    env:
-      FORCE_COLOR: 1
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: live627/check-pr-signoff-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}