diff --git a/.github/workflows/desktop.beta.prod.yml b/.github/workflows/desktop.beta.prod.yml
new file mode 100644
index 000000000..7764c4a17
--- /dev/null
+++ b/.github/workflows/desktop.beta.prod.yml
@@ -0,0 +1,15 @@
+name: Desktop Beta Release
+
+on:
+  push:
+    branches: [ develop ]
+    paths:
+      - packages/desktop/**
+  workflow_dispatch:
+
+jobs:
+  call-reusable-build:
+    uses: standardnotes/app/.github/workflows/desktop.release.reuse.yml@develop
+    secrets: inherit
+    with:
+      channel: beta
\ No newline at end of file
diff --git a/.github/workflows/desktop.release.prod.yml b/.github/workflows/desktop.release.prod.yml
new file mode 100644
index 000000000..839484449
--- /dev/null
+++ b/.github/workflows/desktop.release.prod.yml
@@ -0,0 +1,15 @@
+name: Desktop Prod Release
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - packages/desktop/**
+  workflow_dispatch:
+
+jobs:
+  call-reusable-build:
+    uses: standardnotes/app/.github/workflows/desktop.release.reuse.yml@main
+    secrets: inherit
+    with:
+      channel: prod
\ No newline at end of file
diff --git a/.github/workflows/desktop.release.yml b/.github/workflows/desktop.release.reuse.yml
similarity index 93%
rename from .github/workflows/desktop.release.yml
rename to .github/workflows/desktop.release.reuse.yml
index a39247d7a..c72bc5f2f 100644
--- a/.github/workflows/desktop.release.yml
+++ b/.github/workflows/desktop.release.reuse.yml
@@ -1,11 +1,11 @@
 name: Desktop Release
 
 on:
-  push:
-    branches: [ develop, main ]
-    paths:
-      - packages/desktop/**
-  workflow_dispatch:
+  workflow_call:
+    inputs:
+      channel:
+        required: true
+        type: string
 
 jobs:
   Mac:
@@ -111,7 +111,11 @@ jobs:
             packages/desktop/dist/*.yaml
 
   Windows:
-    runs-on: windows-latest
+    if: ${{ inputs.channel == 'prod' }}
+    runs-on: self-hosted
+    env:
+      WINDOWS_TOKEN_ALIAS: ${{ secrets.WINDOWS_TOKEN_ALIAS }}
+      WINDOWS_TOKEN_PASSWORD: ${{ secrets.WINDOWS_TOKEN_PASSWORD }}
     defaults:
       run:
         working-directory: packages/desktop
@@ -163,7 +167,7 @@ jobs:
           tag_name: "@standardnotes/desktop@${{ steps.package-version.outputs.current-version}}"
           prerelease: true
           draft: true
-          name: "Desktop ${{ steps.package-version.outputs.current-version}}"
+          name: "Desktop ${{ inputs.channel == 'beta' && 'Beta' || '' }} ${{ steps.package-version.outputs.current-version}}"
           files: packages/desktop/dist/*
       - name: Publish Snap
         continue-on-error: true
diff --git a/.github/workflows/desktop.windows.release.yml b/.github/workflows/desktop.windows.sign.yml
similarity index 100%
rename from .github/workflows/desktop.windows.release.yml
rename to .github/workflows/desktop.windows.sign.yml