diff --git a/.github/workflows/build-35.yml b/.github/workflows/build-35.yml
index 0f14d25ff..2fad0fa7d 100644
--- a/.github/workflows/build-35.yml
+++ b/.github/workflows/build-35.yml
@@ -35,19 +35,27 @@ jobs:
       - name: Build v3.5
         run: |
           vendor/bin/rector process --config=config/rector-35.php -- ${{ steps.changed-files.outputs.files }}
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        with:
-          base: "v3.5"
-          token: ${{ secrets.V35_BUILD_TOKEN }}
-          commit-message: "v3.5 automated build change"
-          committer: "lucatume <luca@theaveragedev.com>"
-          branch: "v3.5-automated-build"
-          delete-branch: true
-          title: "v3.5 automated build"
-          body: "v3.5 automated build changes created by the v3.5 automated build workflow"
-          assignees: "lucatume"
-          add-paths: |
-            includes/*.php
-            src/*.php
-            tests/*.php
+      - name: Create Pull Request on v3.5
+        run: |
+          git reset HEAD 
+          git status
+          git stash push --include-untracked -- 'src/*.php' 'includes/*.php' 'tests/*.php'
+          git reset HEAD --hard
+          git status
+          git checkout v3.5
+          git branch -f v3.5-auto-build-from-v4
+          git checkout v3.5-auto-build-from-v4
+          git stash pop
+          git add -- 'src/*.php' 'includes/*.php' 'tests/*.php' 
+          git commit -m "v3.5 auto-build from v4"
+          gh pr create \
+            --base v3.5 \
+            --head-branch v3.5-auto-build-from-v4 \
+            --draft \
+            --assignee lucatume \
+            --title "v4 -> v3.5 auto-build" \
+            --body "v3.5 automated build changes from v4" \
+            --label "auto-build" \
+            --label "v3.5"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}