diff --git a/metadata/org.briarproject.briar.android.txt b/metadata/org.briarproject.briar.android.txt
index e8f2005ba2..96829fdc0d 100644
--- a/metadata/org.briarproject.briar.android.txt
+++ b/metadata/org.briarproject.briar.android.txt
@@ -1,8 +1,8 @@
 Categories:Connectivity,Internet,Security
 License:GPL-3.0-or-later
 Web Site:https://briarproject.org/
-Source Code:https://code.briarproject.org/akwizgran/briar
-Issue Tracker:https://code.briarproject.org/akwizgran/briar/issues
+Source Code:https://code.briarproject.org/briar/briar
+Issue Tracker:https://code.briarproject.org/briar/briar/issues
 FlattrID:592836
 LiberapayID:34745
 Bitcoin:1NZCKkUCtJV2U2Y9hDb9uq8S7ksFCFGR6K
@@ -31,56 +31,19 @@ Build:1.0.1,10001
     gradle=yes
     rm=bramble-j2se
 
-Build:1.1.0,10100
-    disable=doesn't verify
-    commit=release-1.1.0
-    subdir=briar-android
-    gradle=yes
-    rm=bramble-java
-
-Build:1.1.1,10101
-    commit=release-1.1.1
-    subdir=briar-android
-    gradle=official
-    rm=bramble-java
-
-Build:1.1.2,10102
-    commit=release-1.1.2
-    subdir=briar-android
-    gradle=official
-    rm=bramble-java
-
-Build:1.1.3,10103
-    commit=release-1.1.3
-    subdir=briar-android
-    gradle=official
-    rm=bramble-java
-
-Build:1.1.4,10104
-    commit=release-1.1.4
-    subdir=briar-android
-    gradle=official
-    rm=bramble-java
-
 Build:1.1.5,10105
     commit=release-1.1.5
     subdir=briar-android
+    sudo=apt-get update && \
+        apt-get install -y disorderfs
+    init=cd ../.. && \
+        mv org.briarproject.briar.android org.briarproject.briar.android.build && \
+        mkdir org.briarproject.briar.android && \
+        disorderfs --sort-dirents=yes --reverse-dirents=no org.briarproject.briar.android.build org.briarproject.briar.android
     gradle=official
-    rm=bramble-java
+    rm=bramble-java,briar-headless
 
-Maintainer Notes:
-This app should be build reproducible, because upstream wants to use its own signature.
-
-Until we can build the latest version, all else go to the archive directly.
-
-Upstream issue for F-Droid inclusion:
-https://code.briarproject.org/akwizgran/briar/issues/1035
-
-Upstream issue for general reproducible builds:
-https://code.briarproject.org/akwizgran/briar/issues/1273
-.
-
-Archive Policy:0 versions
+Archive Policy:3 versions
 Auto Update Mode:Version release-%v
 Update Check Mode:Tags
 Current Version:1.1.5