diff --git a/.gitignore b/.gitignore
index 97be2857d..67add13a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -143,6 +143,9 @@ storybook-static/
 
 # End of https://www.toptal.com/developers/gitignore/api/vscode,nuxtjs,node
 
+# webstorm
+.idea/*
+
 # Automatically generated files
 apollo/gql.ts
 apollo/graphql.ts
diff --git a/components/DownloadButton.vue b/components/DownloadButton.vue
new file mode 100644
index 000000000..04f0bbcc8
--- /dev/null
+++ b/components/DownloadButton.vue
@@ -0,0 +1,30 @@
+<template>
+  <n-button
+    type="primary"
+    size="large"
+    style="height: 3.2em"
+  >
+    <template #icon>
+      <n-icon>
+        <Icon name="material-symbols:download" />
+      </n-icon>
+    </template>
+    <a
+      class="text-2xl"
+      :href
+      >{{ text }}</a
+    >
+  </n-button>
+</template>
+<script setup lang="ts">
+defineProps({
+  text: {
+    type: String,
+    default: '',
+  },
+  href: {
+    type: String,
+    default: '',
+  },
+})
+</script>
diff --git a/components/LandingPageDownload.client.vue b/components/LandingPageDownload.client.vue
index 6482c898d..9a2d0c297 100644
--- a/components/LandingPageDownload.client.vue
+++ b/components/LandingPageDownload.client.vue
@@ -10,17 +10,55 @@
           JabRef is free and works across all your devices.
         </h3>
         <div class="text-center">
-          <n-button
-            type="primary"
-            size="large"
-            style="height: 3.2em"
-          >
-            <a
-              class="text-2xl"
-              :href="downloadUrl"
-              >Download JabRef</a
-            >
-          </n-button>
+          <span v-if="isWindows()">
+            <n-flex justify="center">
+              <DownloadButton
+                text=".msi"
+                href="/download/win_msi"
+              />
+              <DownloadButton
+                text="Windows Portable"
+                href="/download/win_zip"
+              />
+            </n-flex>
+          </span>
+
+          <span v-if="isLinux()">
+            <n-flex justify="center">
+              <DownloadButton
+                text=".deb"
+                href="/download/linux_deb"
+              />
+              <DownloadButton
+                text=".rpm"
+                href="/download/linux_rpm"
+              />
+              <DownloadButton
+                text="Linux Portable"
+                href="/download/linux_tar_gz"
+              />
+            </n-flex>
+          </span>
+          <span v-if="isMac()">
+            <n-flex justify="center">
+              <DownloadButton
+                text="arm64 .dmg"
+                href="/download/mac_arm64_dmg"
+              />
+              <DownloadButton
+                text="arm64 .dmg"
+                href="/download/mac_arm64_pkg"
+              />
+              <DownloadButton
+                text="x86_64 .dmg"
+                href="/download/mac_x86_64_dmg"
+              />
+              <DownloadButton
+                text="x86_64 .pkg"
+                href="/download/mac_x86_64_pkg"
+              />
+            </n-flex>
+          </span>
         </div>
 
         <div class="text-center pt-8 text-sm">
@@ -30,7 +68,7 @@
             Also available for
             <t-nuxtlink
               class="text-primary-500"
-              href="download"
+              href="https://github.com/JabRef/jabref/releases/latest"
               >mac OS X and Linux</t-nuxtlink
             >
             <br />
@@ -41,7 +79,7 @@
             Also available for
             <t-nuxtlink
               class="text-primary-500"
-              href="download"
+              href="https://github.com/JabRef/jabref/releases/latest"
               >Windows and Linux</t-nuxtlink
             >
             <br />
@@ -52,7 +90,7 @@
             Also available for
             <t-nuxtlink
               class="text-primary-500"
-              href="download"
+              href="https://github.com/JabRef/jabref/releases/latest"
             >
               mac OS X and Windows
             </t-nuxtlink>
@@ -77,6 +115,4 @@
 </template>
 <script setup lang="ts">
 import { isLinux, isMac, isWindows } from '~/composables/detectOs'
-
-const downloadUrl = constructDownloadUrl()
 </script>
diff --git a/composables/downloads.ts b/composables/downloads.ts
index af281a1f9..692e4a946 100644
--- a/composables/downloads.ts
+++ b/composables/downloads.ts
@@ -4,9 +4,9 @@ export function constructDownloadUrl(): string {
   if (os) {
     osSuffix =
       {
-        windows: 'win',
-        mac: 'mac',
-        linux: 'linux',
+        windows: 'win_msi',
+        mac: 'mac_arm64_dmg',
+        linux: 'linux_deb',
       }[os] || ''
   }
   return `/download/${osSuffix}`
diff --git a/pages/download/[[os]].vue b/pages/download/[[os]].vue
index 91abf387b..8719fdae5 100644
--- a/pages/download/[[os]].vue
+++ b/pages/download/[[os]].vue
@@ -20,17 +20,37 @@ definePageMeta({
   layout: false,
 
   middleware: async (to) => {
-    let downloadUrl = 'https://www.fosshub.com/JabRef.html'
     const os = to.params.os as string | undefined
-    if (os && ['win', 'mac', 'linux'].includes(os)) {
+    let downloadUrl = `https://github.com/JabRef/jabref/releases/download/`
+    if (
+      os &&
+      [
+        'win_msi',
+        'win_zip',
+        'mac_arm64_dmg',
+        'mac_arm64_pkg',
+        'mac_x86_64_dmg',
+        'mac_x86_64_pkg',
+        'linux_deb',
+        'linux_rpm',
+        'linux_tar_gz',
+      ].includes(os)
+    ) {
       const { data } = await useFetch('/api/getLatestRelease')
       const latestRelease = data.value?.version
+      downloadUrl += `v${latestRelease}`
       if (latestRelease) {
         downloadUrl +=
           {
-            win: `?dwl=JabRef-${latestRelease}.msi`,
-            mac: `?dwl=JabRef-${latestRelease}.pkg`,
-            linux: `?dwl=jabref_${latestRelease}_amd64.deb`,
+            win_msi: `/JabRef-${latestRelease}.msi`,
+            win_zip: `/JabRef-${latestRelease}-portable_windows.zip`,
+            mac_arm64_dmg: `/JabRef-${latestRelease}-arm64.dmg`,
+            mac_arm64_pkg: `/JabRef-${latestRelease}-arm64.pkg`,
+            mac_x86_64_dmg: `/JabRef-${latestRelease}.dmg`,
+            mac_x86_64_pkg: `/JabRef-${latestRelease}.pkg`,
+            linux_deb: `/jabref_${latestRelease}_amd64.deb`,
+            linux_rpm: `/jabref-${latestRelease}-1.x86_64.rpm`,
+            linux_tar_gz: `/JabRef-${latestRelease}-portable_linux.tar.gz`,
           }[os] ?? ''
       }
     }
@@ -38,5 +58,5 @@ definePageMeta({
     return await navigateTo(downloadUrl, { external: true })
   },
 })
-const downloadUrl = 'https://www.fosshub.com/JabRef.html'
+const downloadUrl = `https://github.com/JabRef/jabref/releases/download/`
 </script>
diff --git a/pages/index.vue b/pages/index.vue
index 751c64160..d3c15ee9c 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -77,7 +77,7 @@
                 <ClientOnly>
                   <a
                     class="text-2xl"
-                    :href="constructDownloadUrl()"
+                    href="/#download"
                     >Download JabRef</a
                   >
                 </ClientOnly>
@@ -97,7 +97,6 @@
 </template>
 
 <script setup lang="ts">
-import { constructDownloadUrl } from '~/composables/downloads'
 definePageMeta({ layout: false })
 
 const links = [
diff --git a/server/e2e.test.ts b/server/e2e.test.ts
index e339e5bf4..30739dd04 100644
--- a/server/e2e.test.ts
+++ b/server/e2e.test.ts
@@ -11,12 +11,12 @@ describe('index page', () => {
 })
 
 describe('download', () => {
-  it('redirects to fosshub', async () => {
+  it('downloads file from GitHub release', async () => {
     const response = await fetch('/download')
     // Client side redirect uses meta refresh
     expect(response.status).toBe(200)
     expect(await response.text()).toContain(
-      'https://www.fosshub.com/JabRef.html',
+      'https://github.com/JabRef/jabref/releases/download/',
     )
   })
 })