diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
index 2176b8e..8c247ae 100644
--- a/.github/workflows/create-release-pr.yml
+++ b/.github/workflows/create-release-pr.yml
@@ -31,7 +31,9 @@ jobs:
       - name: Get current version
         id: current_version
         run: |
-          version=$(grep '^version:' deploy/helm/rag/Chart.yaml | awk '{print $2}')
+          # Get version from main branch since that's the source of truth for releases
+          git fetch origin main
+          version=$(git show origin/main:deploy/helm/rag/Chart.yaml | grep '^version:' | awk '{print $2}')
           echo "version=$version" >> $GITHUB_OUTPUT
 
       - name: Calculate new version
@@ -71,6 +73,16 @@ jobs:
           git checkout -b release/v${{ steps.new_version.outputs.version }}
           git add deploy/helm/rag/Chart.yaml deploy/helm/rag/values.yaml
           git commit -m "chore: bump version to ${{ steps.new_version.outputs.version }}"
+
+          # Merge main into release branch to pre-resolve conflicts
+          git fetch origin main
+          git merge origin/main --no-edit || {
+            # If conflicts occur, take our (release branch) version for Chart.yaml and values.yaml
+            git checkout --ours deploy/helm/rag/Chart.yaml deploy/helm/rag/values.yaml
+            git add deploy/helm/rag/Chart.yaml deploy/helm/rag/values.yaml
+            git commit --no-edit
+          }
+
           git push origin release/v${{ steps.new_version.outputs.version }}
 
       - name: Create Pull Request
diff --git a/deploy/helm/rag/Chart.yaml b/deploy/helm/rag/Chart.yaml
index 3f8e51c..c898640 100644
--- a/deploy/helm/rag/Chart.yaml
+++ b/deploy/helm/rag/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: rag
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.24
-appVersion: "0.2.24"
+version: 0.2.25
+appVersion: "0.2.25"
 
 dependencies:
   - name: pgvector
diff --git a/deploy/helm/rag/values.yaml b/deploy/helm/rag/values.yaml
index 44921bc..79d54f0 100644
--- a/deploy/helm/rag/values.yaml
+++ b/deploy/helm/rag/values.yaml
@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   repository: quay.io/rh-ai-quickstart/llamastack-dist-ui
   pullPolicy: Always
-  tag: 0.2.24
+  tag: 0.2.25
 
 service:
   type: ClusterIP