diff --git a/website/langs/en.json b/website/langs/en.json
index 8dc9de119..66989ef93 100644
--- a/website/langs/en.json
+++ b/website/langs/en.json
@@ -233,5 +233,18 @@
     "menu": "Menu",
     "on-this-page": "On this page",
     "back-to-top": "Back to top",
-    "glossary": "Glossary"
+    "glossary": "Glossary",
+    "simplex-chat-via-f-droid": "SimpleX Chat via F-Droid",
+    "simplex-chat-repo": "SimpleX Chat repo",
+    "stable-and-beta-versions-built-by-developers": "Stable and beta versions built by the developers",
+    "to-add-it-to-your-f-droid-client": "To add it to your F-Droid client",
+    "scan-the-qr-code-or": "scan the QR code or",
+    "use-this-url": "use this URL",
+    "signing-key-fingerprint": "Signing key fingerprint (SHA-256)",
+    "f-droid-org-repo": "F-Droid.org repo",
+    "stable-versions-built-by-f-droid-org": "Stable versions built by F-Droid.org",
+    "releases-to-this-repo-are-done-1-2-days-later": "The releases to this repo are done 1-2 days later",
+    "simplex-and-f-droid-repo-sign-builds-with-different-keys": "SimpleX Chat and F-Droid.org repositories sign builds with the different keys. To switch, please",
+    "export": "export",
+    "chat-db-and-re-install-app": "the chat database and re-install the app"
 }
diff --git a/website/src/_includes/contact_page.html b/website/src/_includes/contact_page.html
index e37dcddd0..9e81a0b50 100644
--- a/website/src/_includes/contact_page.html
+++ b/website/src/_includes/contact_page.html
@@ -18,7 +18,7 @@
             <div class="flex items-center justify-center gap-4 flex-wrap">
                 <a href="https://apps.apple.com/us/app/simplex-chat/id1605771084" target="_blank"><img class="h-[40px] w-auto" src="/img/new/apple_store.svg" /></a>
                 <a href="https://play.google.com/store/apps/details?id=chat.simplex.app" target="_blank" title="Public iOS preview on TestFlight"><img class="h-[40px] w-auto" src="/img/new/google_play.svg" /></a>
-                <a href="https://app.simplex.chat" target="_blank" title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
+                <a href="/fdroid"  title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
                 <a href="https://testflight.apple.com/join/DWuT2LQu" target="_blank"><img class="h-[40px] w-auto" src="/img/new/testflight.png" /></a>
                 <a href="https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk" target="_blank"><img class="h-[40px] w-auto" src="/img/new/apk_icon.png" /></a>
             </div>
@@ -51,7 +51,7 @@
                 <div class="flex flex-wrap items-center justify-center gap-2">
                     <a class="apple-store-btn hidden" href="https://apps.apple.com/us/app/simplex-chat/id1605771084" target="_blank"><img class="h-[40px] w-auto" src="/img/new/apple_store.svg" /></a>
                     <a class="google-play-btn hidden" href="https://play.google.com/store/apps/details?id=chat.simplex.app" target="_blank" title="Public iOS preview on TestFlight"><img class="h-[40px] w-auto" src="/img/new/google_play.svg" /></a>
-                    <a class="f-droid-btn hidden" href="https://app.simplex.chat" target="_blank" title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
+                    <a class="f-droid-btn hidden" href="/fdroid"  title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
                 </div>
 
                 <div class="absolute bg-[#0197FF] h-[44px] w-[44px] rounded-full flex items-center justify-center top-0 left-0 translate-x-[-30%] translate-y-[-30%]">
diff --git a/website/src/_includes/hero.html b/website/src/_includes/hero.html
index 38001afd9..43fb4a354 100644
--- a/website/src/_includes/hero.html
+++ b/website/src/_includes/hero.html
@@ -46,7 +46,7 @@
                             <div class="socials flex items-center justify-center xl:justify-start gap-4 flex-wrap mt-[30px]">
                                 <a href="https://apps.apple.com/us/app/simplex-chat/id1605771084" target="_blank"><img class="h-[40px] w-auto" src="/img/new/apple_store.svg" /></a>
                                 <a href="https://play.google.com/store/apps/details?id=chat.simplex.app" target="_blank" title="Public iOS preview on TestFlight"><img class="h-[40px] w-auto" src="/img/new/google_play.svg" /></a>
-                                <a href="https://app.simplex.chat" target="_blank" title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
+                                <a href="/fdroid" title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
                                 <a href="https://testflight.apple.com/join/DWuT2LQu" target="_blank"><img class="h-[40px] w-auto" src="/img/new/testflight.png" /></a>
                                 <a href="https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk" target="_blank"><img class="h-[40px] w-auto" src="/img/new/apk_icon.png" /></a>
                             </div>
diff --git a/website/src/_includes/sections/join_simplex.html b/website/src/_includes/sections/join_simplex.html
index edd714806..400a2482d 100644
--- a/website/src/_includes/sections/join_simplex.html
+++ b/website/src/_includes/sections/join_simplex.html
@@ -28,7 +28,7 @@
         <div class="flex items-center justify-center gap-4 flex-wrap">
             <a href="https://apps.apple.com/us/app/simplex-chat/id1605771084" target="_blank"><img class="h-[40px] w-auto" src="/img/new/apple_store.svg" /></a>
             <a href="https://play.google.com/store/apps/details?id=chat.simplex.app" target="_blank" title="Public iOS preview on TestFlight"><img class="h-[40px] w-auto" src="/img/new/google_play.svg" /></a>
-            <a href="https://app.simplex.chat" target="_blank" title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
+            <a href="/fdroid"  title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
             <a href="https://testflight.apple.com/join/DWuT2LQu" target="_blank"><img class="h-[40px] w-auto" src="/img/new/testflight.png" /></a>
             <a href="https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk" target="_blank"><img class="h-[40px] w-auto" src="/img/new/apk_icon.png" /></a>
         </div>
diff --git a/website/src/fdroid.html b/website/src/fdroid.html
new file mode 100644
index 000000000..9951a2d1e
--- /dev/null
+++ b/website/src/fdroid.html
@@ -0,0 +1,48 @@
+---
+layout: layouts/main.html
+title: "SimpleX Chat - Get the app via F-Droid"
+description: "Get the app via F-Droid"
+templateEngineOverride: njk
+---
+
+<section class="bg-primary-bg-light dark:bg-primary-bg-dark py-[75px] mt-[66px] px-5">
+    <div class="container text-black dark:text-white">
+        <h2 class="primary-header text-[35px] leading-[45px] md:leading-[55px] lg:text-[45px] text-center font-bold gradient-text mb-20">{{ "simplex-chat-via-f-droid" | i18n({}, lang ) | safe }}</h2>
+
+        <div class="flex flex-col lg:flex-row gap-16 lg:gap-28">
+
+            <div class="w-full lg:w-3/5">
+                <h3 class="text-grey-black dark:text-white text-[24px] lg:text-[32px] font-bold mb-2">{{ "simplex-chat-repo" | i18n({}, lang ) | safe }}</h3>
+                <div class="flex flex-col-reverse sm:flex-row gap-4">
+                    <div>
+                        <p class="mb-2 text-lg font-medium mt-6">{{ "stable-and-beta-versions-built-by-developers" | i18n({}, lang ) | safe }}</p>
+                        <p>{{ "to-add-it-to-your-f-droid-client" | i18n({}, lang ) | safe }}, <span class="hidden sm:inline">{{ "scan-the-qr-code-or" | i18n({}, lang ) | safe }}</span> {{ "use-this-url" | i18n({}, lang ) | safe }}:</p>
+                        <a class="mb-2 break-words text-primary-light dark:text-primary-dark block text-left rtl:text-right text-[14px] xl:text-[16px] leading-[34px] underline-offset-2"
+                            href="https://app.simplex.chat/fdroid/repo?fingerprint=9F358FF284D1F71656A2BFAF0E005DEAE6AA14143720E089F11FF2DDCFEB01BA">
+                            <code>https://app.simplex.chat/fdroid/repo</code>
+                        </a>
+                        <p>
+                            {{ "signing-key-fingerprint" | i18n({}, lang ) | safe }}:
+                            <blockquote class="font-bold mt-2">
+                                9F 35 8F F2 84 D1 F7 16 56 A2 BF AF 0E 00 5D EA E6 AA 14 14 37 20 E0 89 F1 1F F2 DD CF EB 01 BA
+                            </blockquote>
+                        </p>
+                    </div>
+
+                    <div class="hidden sm:block max-w-[280px] md:max-w-[220px] lg:max-w-[240px]">
+                        <img alt="QR: test" src="/img/new/fdroid-qrcode.png">
+                    </div>
+                </div>
+            </div>
+
+            <div class="w-full lg:w-2/5">
+                <h3 class="text-grey-black dark:text-white text-[24px] lg:text-[32px] font-bold mb-6">{{ "f-droid-org-repo" | i18n({}, lang ) | safe }}</h3>
+                <a class="inline-block" href="https://f-droid.org/en/packages/chat.simplex.app/" target="_blank" title="SimpleX F-Droid Repository"><img class="h-[40px] w-auto" src="/img/new/f_droid.svg" /></a>
+                <p class="mb-2 text-lg font-medium mt-6">{{ "stable-versions-built-by-f-droid-org" | i18n({}, lang ) | safe }}</p>
+                <p class="mb-2">{{ "releases-to-this-repo-are-done-1-2-days-later" | i18n({}, lang ) | safe }}.</p>
+                <p class="mb-2">{{ "simplex-and-f-droid-repo-sign-builds-with-different-keys" | i18n({}, lang ) | safe }} <a href="/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device">{{ "export" | i18n({}, lang ) | safe }}</a> {{ "chat-db-and-re-install-app" | i18n({}, lang ) | safe }}.</p>
+            </div>
+        </div>
+
+    </div>
+</section>
\ No newline at end of file
diff --git a/website/src/img/new/fdroid-qrcode.png b/website/src/img/new/fdroid-qrcode.png
new file mode 100644
index 000000000..0edc47861
Binary files /dev/null and b/website/src/img/new/fdroid-qrcode.png differ