diff --git a/apps/website/src/lib/download-helper.ts b/apps/website/src/lib/download-helper.ts
index 3e7b958c4..7c82c0d72 100644
--- a/apps/website/src/lib/download-helper.ts
+++ b/apps/website/src/lib/download-helper.ts
@@ -1,8 +1,12 @@
 export type Architecture = 'x64' | 'arm64';
 
-type Platform = 'mac' | 'windows' | 'linux';
+export type Platform = 'mac' | 'windows' | 'linux';
 
-type Apps = 'desktop';
+let version = "v0.94.1";
+
+export function buildDesktopDownloadUrl(platform: Platform, format: string, architecture: Architecture): string {
+    return `https://github.com/TriliumNext/Notes/releases/download/${version}/TriliumNextNotes-${version}-${platform}-${architecture}.${format}`;
+}
 
 export const downloadMatrix = {
     desktop: {
@@ -11,14 +15,10 @@ export const downloadMatrix = {
             downloads: {
                 exe: {
                     recommended: true,
-                    name: "Installer (.exe)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-windows-x64.exe",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-windows-arm64.exe"
+                    name: "Installer (.exe)"
                 },
                 zip: {
-                    name: "Portable (.zip)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-windows-x64.zip",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-windows-arm64.zip"
+                    name: "Portable (.zip)"
                 }
             }
         },
@@ -26,40 +26,28 @@ export const downloadMatrix = {
             title: "Linux",
             downloads: {
                 deb: {
-                    name: "Debian/Ubuntu (.deb)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-x64.deb",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-arm64.deb"
+                    name: "Debian/Ubuntu (.deb)"
                 },
                 rpm: {
-                    name: "Red Hat-based distributions (.rpm)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-x64.rpm",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-arm64.rpm"
+                    name: "Red Hat-based distributions (.rpm)"
                 },
                 flatpak: {
-                    name: "Flatpak (.flatpak)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-x64.flatpak",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-arm64.flatpak"
+                    name: "Flatpak (.flatpak)"
                 },
                 zip: {
-                    name: "Portable (.zip)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-x64.zip",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-linux-arm64.zip"
+                    name: "Portable (.zip)"
                 }
             }
         },
-        mac: {
+        macos: {
             title: "macOS",
             downloads: {
                 dmg: {
                     recommended: true,
-                    name: "Installer (.dmg)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-macos-x64.dmg",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-macos-arm64.dmg"
+                    name: "Installer (.dmg)"
                 },
                 zip: {
-                    name: "Portable (.zip)",
-                    x64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-macos-x64.zip",
-                    arm64: "https://github.com/TriliumNext/Notes/releases/download/nightly/TriliumNextNotes-develop-macos-arm64.zip"
+                    name: "Portable (.zip)"
                 }
             }
         }
diff --git a/apps/website/src/routes/download/+page.svelte b/apps/website/src/routes/download/+page.svelte
index 9e4d1c25b..b54d8efba 100644
--- a/apps/website/src/routes/download/+page.svelte
+++ b/apps/website/src/routes/download/+page.svelte
@@ -1,6 +1,8 @@
-<script>
-    import { downloadMatrix, getArchitecture } from "$lib/download-helper";
+<script lang="ts">
+    import type { Platform } from "$lib/download-helper";
+    import { buildDesktopDownloadUrl, downloadMatrix, getArchitecture } from "$lib/download-helper";
 
+    let architectures = ["x64", "arm64"];
     let architecture = getArchitecture();
 </script>
 
@@ -11,7 +13,7 @@
     <div class="col-span-3 flex justify-center items-center gap-3 mb-6">
         <span class="text-gray-600 font-medium mr-2">Architecture:</span>
         <div class="inline-flex bg-violet-100 rounded-full shadow p-1">
-            {#each ["x64", "arm64"] as arch}            
+            {#each architectures as arch}            
                 <button class="py-2 px-6 rounded-full font-semibold focus:outline-none transition
                     text-violet-700 border-violet-700
                     aria-pressed:bg-violet-700 aria-pressed:text-violet-100
@@ -23,13 +25,13 @@
     </div>
 
     <div class="grid md:grid-cols-3 gap-10">
-        {#each Object.values(downloadMatrix.desktop) as platform}
+        {#each Object.entries(downloadMatrix.desktop) as [platformId, platform]}
         <div class="bg-white rounded-xl shadow overflow-hidden">
             <div class="p-6">
                 <h3 class="text-xl font-semibold mb-2">{platform.title} ({architecture})</h3>
                 <div class="flex flex-wrap gap-y-2">
-                    {#each Object.values(platform.downloads) as download}
-                        <a href={download[architecture]} class={
+                    {#each Object.entries(platform.downloads) as [format, download]}                    
+                        <a href={buildDesktopDownloadUrl(platformId as Platform, format, architecture)} class={
                             download.recommended
                             ? "py-2 px-5 bg-violet-600 text-white font-semibold rounded-full shadow-md hover:bg-violet-700 focus:outline-none focus:ring focus:ring-violet-400 focus:ring-opacity-75 grow"
                             : "py-2 px-5 border-1 border-gray-500 text-gray-500 font-semibold rounded-full shadow-md grow"