diff --git a/.github/workflows/update-schemastore.yaml b/.github/workflows/update-schemastore.yaml
index 844503bad9..22ed4d1fe7 100644
--- a/.github/workflows/update-schemastore.yaml
+++ b/.github/workflows/update-schemastore.yaml
@@ -16,8 +16,10 @@ jobs:
       - uses: actions/checkout@v6
       - name: Fork and clone SchemaStore
         run: gh repo fork SchemaStore/schemastore --clone --remote -- /tmp/schemastore
-      - name: Create or reset branch
-        run: git switch -C "$BRANCH"
+      - name: Create or reset branch from upstream
+        run: |
+          git fetch upstream master
+          git switch -C "$BRANCH" upstream/master
         working-directory: /tmp/schemastore
       - name: Copy schema with SchemaStore $id
         run: |
diff --git a/docs/changelog/3828.bugfix.rst b/docs/changelog/3828.bugfix.rst
new file mode 100644
index 0000000000..b1b036b22d
--- /dev/null
+++ b/docs/changelog/3828.bugfix.rst
@@ -0,0 +1,2 @@
+Fix SchemaStore update workflow creating PRs with merge conflicts by branching from upstream master - by
+:user:`gaborbernat`.