diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 476d64e8ed..c50d7dda7e 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -28,3 +28,5 @@
 - [ ] I have added tests to cover my changes.
 - [ ] All new and existing tests passed.
 - [ ] **I have built and run the editor to try this change out.**
+
+<!-- Consider opening a draft PR for initial review. -->
diff --git a/.github/workflows/build-avalonia-editor.yml b/.github/workflows/build-avalonia-editor.yml
new file mode 100644
index 0000000000..7887547be5
--- /dev/null
+++ b/.github/workflows/build-avalonia-editor.yml
@@ -0,0 +1,111 @@
+name: Build Avalonia Editor
+
+on:
+  pull_request:
+    paths:
+      - '.github/workflows/build-avalonia-editor.yml'
+      - 'build/Stride.Editor.Avalonia.slnf'
+      - 'sources/assets/**'
+      - 'sources/core/**'
+      - 'sources/editor/**'
+      - 'sources/presentation/**'
+      - 'sources/shared/**'
+      - 'sources/targets/**'
+      - '!**/.all-contributorsrc'
+      - '!**/.editorconfig'
+      - '!**/.gitignore'
+      - '!**/*.md'
+      - '!crowdin.yml'
+    types: [opened, synchronize, reopened, ready_for_review]
+  workflow_dispatch:
+    inputs:
+      build-type:
+        description: Build Configuration
+        default: Debug
+        type: choice
+        options:
+          - Debug
+          - Release
+      platform:
+        description: Platform
+        default: Windows
+        type: choice
+        options:
+          - Windows
+          - Linux
+  workflow_call:
+    inputs:
+      build-type:
+        default: Debug
+        type: string
+      platform:
+        default: Windows
+        type: string
+
+jobs:
+  Setup:
+    runs-on: ubuntu-latest
+    outputs:
+      build-type: ${{ steps.setup.outputs.build-type }}
+      platform: ${{ steps.setup.outputs.platform }}
+    steps:
+      - id: setup
+        run: |
+          echo "build-type=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}" >> $GITHUB_OUTPUT
+          echo "platform=${{ github.event.inputs.platform || inputs.platform || 'Windows' }}" >> $GITHUB_OUTPUT
+
+  #
+  # Build Avalonia Editor on Linux
+  #
+  Linux:
+    needs: Setup
+    if: ${{ needs.Setup.outputs.platform == 'Linux' }} 
+    name: Linux (${{ needs.Setup.outputs.build-type }})
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+      - name: Install dependencies
+        run: |
+          sudo apt-get install clang lld
+      - name: Build
+        run: |
+          dotnet build build/Stride.Editor.Avalonia.slnf
+            -m:1 -nr:false \
+            -v:m -p:WarningLevel=0 \
+            -p:Configuration=${{ needs.Setup.outputs.build-type }} \
+            -p:StridePlatforms=Linux \
+            -p:StrideGraphicsApis=OpenGL \
+            -p:StrideSkipUnitTests=true \
+            -p:StrideSkipAutoPack=true
+
+  #
+  # Build Avalonia Editor on Windows
+  #
+  Windows:
+    needs: Setup
+    if: ${{ needs.Setup.outputs.platform == 'Windows' }} 
+    name: Windows (${{ needs.Setup.outputs.build-type }})
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+      - uses: microsoft/setup-msbuild@v2
+      - name: Build
+        run: |
+          msbuild build\Stride.Editor.Avalonia.slnf `
+            -restore -m:1 -nr:false `
+            -v:m -p:WarningLevel=0 `
+            -p:Configuration=${{ needs.Setup.outputs.build-type }} `
+            -p:StridePlatforms=Windows `
+            -p:StrideGraphicsApis=Direct3D11 `
+            -p:StrideSkipUnitTests=true `
+            -p:StrideSkipAutoPack=true
diff --git a/.github/workflows/build-linux-runtime.yml b/.github/workflows/build-linux-runtime.yml
index 531768b08f..ef6e9b125c 100644
--- a/.github/workflows/build-linux-runtime.yml
+++ b/.github/workflows/build-linux-runtime.yml
@@ -50,7 +50,7 @@ jobs:
   Linux-Runtime:
     if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call' || github.event.pull_request.draft == false }}
     name: Build (${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }}, ${{ github.event.inputs.graphics-api || inputs.graphics-api || 'OpenGL' }})
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -58,14 +58,16 @@ jobs:
       - uses: actions/setup-dotnet@v4
         with:
           dotnet-version: '8.0.x'
-      - uses: microsoft/setup-msbuild@v2
+      - name: Install dependencies
+        run: |
+          sudo apt-get install clang lld
       - name: Build
         run: |
-          msbuild build\Stride.Runtime.sln `
-            -restore -m:1 -nr:false `
-            -v:m -p:WarningLevel=0 `
-            -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} `
-            -p:StridePlatforms=Linux `
-            -p:StrideGraphicsApis=${{ github.event.inputs.graphics-api || inputs.graphics-api || 'OpenGL' }} `
-            -p:StrideSkipUnitTests=true `
+          dotnet build build/Stride.Runtime.sln \
+            -m:1 -nr:false \
+            -v:m -p:WarningLevel=0 \
+            -p:Configuration=${{ github.event.inputs.build-type || inputs.build-type || 'Debug' }} \
+            -p:StridePlatforms=Linux \
+            -p:StrideGraphicsApis=${{ github.event.inputs.graphics-api || inputs.graphics-api || 'OpenGL' }} \
+            -p:StrideSkipUnitTests=true \
             -p:StrideSkipAutoPack=true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 35813c2aba..248a5def62 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - xplat-editor
     paths:
       - '.github/workflows/**'
       - 'build/**'