diff --git a/metadata/network.loki.messenger.fdroid.yml b/metadata/network.loki.messenger.fdroid.yml
index 06c3717b20..f957bcf7b1 100644
--- a/metadata/network.loki.messenger.fdroid.yml
+++ b/metadata/network.loki.messenger.fdroid.yml
@@ -1375,10 +1375,54 @@ Builds:
       - libsession-util/libsession-util/external
     ndk: r26b
 
+  - versionName: 1.21.0
+    versionCode: 3965
+    commit: 1228e1aaaedbd8b98f578b44b5b24d0989910059
+    subdir: app
+    submodules: true
+    gradle:
+      - website
+    output: build/outputs/apk/website/release/session-*-universal.apk
+    srclibs:
+      - session-lazysodium-android@5.1.1
+    rm:
+      - liblazysodium
+    prebuild:
+      - ln -s $$session-lazysodium-android$$/app ../liblazysodium
+      - ln -s $$session-lazysodium-android$$/session-lazysodium-java ..
+      - sed -i -e 's/classifier/archiveClassifier/' -e '/android {/a namespace "com.goterl.lazysodium"'
+        ../liblazysodium/build.gradle
+      - sed -i -e '/gms/d' -e 's/raw.github.com.*"/jitpack.io"/' -e 's|developer.huawei.com/repo/|jitpack.io|'
+        ../build.gradle
+      - sed -i -e '/gms/d' -e '/firebase-messaging/,/^    }/d' -e '/enable true/d'
+        -e '/circular-progress-button/s/1.1.3-S2/1.1.3/' -e '/defaultConfig/a applicationId
+        "network.loki.messenger.fdroid"' -e 's/ext.websiteUpdateUrl = ".*"/ext.websiteUpdateUrl
+        = "null"/g' build.gradle
+      - sed -i -E -e '/app_name/s/>(.+)</>\1 F-Droid</' src/main/res/*/strings.xml
+      - for uri in $(sed -n -E 's/android:authorities="network.loki.(.*)"/\1/p' src/main/AndroidManifest.xml);
+        do find src/main/java/org/thoughtcrime/securesms -type f -exec sed -i -e "s/network.loki.$uri/network.loki.fdroid.$uri/"
+        {} +; done
+      - sed -i -e '/READ_PHONE_STATE/d' -e '/c2dm/d' -e 's/ACCESS_SESSION_SECRETS/fdroid.ACCESS_SESSION_SECRETS/'
+        -e '/android:authorities/s/network.loki/network.loki.fdroid/' src/main/AndroidManifest.xml
+      - sdkmanager 'cmake;3.22.1'
+      - sed -i -e 's/-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx4096M"/-Xmx4096M
+        -Dkotlin.daemon.jvm.options\="-Xmx4096M" -XX:MaxMetaspaceSize=512m/' ../gradle.properties
+      - sed -i -e '2a import org.session.libsession.messaging.notifications.TokenFetcher'
+        src/website/kotlin/org/thoughtcrime/securesms/notifications/*.kt
+      - sed -i -e '/NoOpTokenFetcher/a override val token = MutableStateFlow<String?>(null)\noverride
+        fun onNewToken(token:\ String) { this.token.value = token }' -e '/fetch/d'
+        -e '2a import kotlinx.coroutines.flow.MutableStateFlow' src/website/kotlin/org/thoughtcrime/securesms/notifications/NoOpTokenFetcher.kt
+      - sed -i -e '/runCatching {/,+4d' -e '/FirebaseMessaging/d' -e '/kotlinx.coroutines.tasks.await/d'
+        src/main/java/org/thoughtcrime/securesms/util/ClearDataUtils.kt
+      - sed -i -e '/firebase/d' src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+    scandelete:
+      - libsession-util/libsession-util/external
+    ndk: r26b
+
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
 VercodeOperation:
   - 10*%c + 5
 UpdateCheckData: app/build.gradle|canonicalVersionCode\s=\s(\d+)|.|canonicalVersionName\s=\s"([\d.]+)"
-CurrentVersion: 1.20.8
-CurrentVersionCode: 3905
+CurrentVersion: 1.21.0
+CurrentVersionCode: 3965