diff --git a/metadata/ch.admin.bag.covidcertificate.verifier.yml b/metadata/ch.admin.bag.covidcertificate.verifier.yml
index 6169065e10..a48784081b 100644
--- a/metadata/ch.admin.bag.covidcertificate.verifier.yml
+++ b/metadata/ch.admin.bag.covidcertificate.verifier.yml
@@ -13,7 +13,7 @@ AutoName: Covid Cert
 
 RepoType: git
 Repo: https://github.com/admin-ch/CovidCertificate-App-Android
-Binaries: https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v%v-%c-verifier/verifier-prod-%v-%c-signed.apk
+Binaries: https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v%v-%c-verifier-fdroid/verifier-prod-%v-%c-signed.apk
 
 Builds:
   - versionName: 1.2.0
@@ -142,9 +142,8 @@ Builds:
         | tr -cd '0-9')" >> gradle.properties
 
   - versionName: 2.7.0
-    versionCode: 2700
-    disable: dose not verify
-    commit: 83523af280565ef61fd90ab194a4ccdf2c3bd56d
+    versionCode: 2701
+    commit: ef9c9a71480bc76a5932de3ae05228469ce933af
     subdir: verifier
     sudo:
       - apt-get update || apt-get update
@@ -155,10 +154,11 @@ Builds:
     rm:
       - wallet/testKeystore
       - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-verifier/verifier-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
+    prebuild: printf '\nbranch=release/version-$$VERSION$$-fdroid\nbuildTimestamp=%s\n'
+        "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-verifier-fdroid/verifier-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
         | tr -cd '0-9')" >> gradle.properties
 
 AutoUpdateMode: Version
-UpdateCheckMode: Tags ^v[\d.]+-\d+-verifier$
+UpdateCheckMode: Tags ^v[\d.]+-\d+-verifier-fdroid$
 CurrentVersion: 2.7.0
-CurrentVersionCode: 2700
+CurrentVersionCode: 2701
diff --git a/metadata/ch.admin.bag.covidcertificate.wallet.yml b/metadata/ch.admin.bag.covidcertificate.wallet.yml
index f4dbc68815..88db8c2179 100644
--- a/metadata/ch.admin.bag.covidcertificate.wallet.yml
+++ b/metadata/ch.admin.bag.covidcertificate.wallet.yml
@@ -13,7 +13,7 @@ AutoName: Covid Cert
 
 RepoType: git
 Repo: https://github.com/admin-ch/CovidCertificate-App-Android
-Binaries: https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v%v-%c-wallet/wallet-prod-%v-%c-signed.apk
+Binaries: https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v%v-%c-wallet-fdroid/wallet-prod-%v-%c-signed.apk
 
 Builds:
   - versionName: 1.2.0
@@ -142,9 +142,8 @@ Builds:
         | tr -cd '0-9')" >> gradle.properties
 
   - versionName: 2.7.0
-    versionCode: 2700
-    disable: dose not verify
-    commit: 83523af280565ef61fd90ab194a4ccdf2c3bd56d
+    versionCode: 2701
+    commit: ef9c9a71480bc76a5932de3ae05228469ce933af
     subdir: wallet
     sudo:
       - apt-get update || apt-get update
@@ -155,10 +154,11 @@ Builds:
     rm:
       - wallet/testKeystore
       - verifier/testKeystore
-    prebuild: printf '\nbuildTimestamp=%s\n' "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-wallet/wallet-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
+    prebuild: printf '\nbranch=release/version-$$VERSION$$-fdroid\nbuildTimestamp=%s\n'
+        "$(curl -sL https://github.com/admin-ch/CovidCertificate-App-Android/releases/download/v$$VERSION$$-$$VERCODE$$-wallet-fdroid/wallet-prod-$$VERSION$$-$$VERCODE$$-buildtimestamp.txt
         | tr -cd '0-9')" >> gradle.properties
 
 AutoUpdateMode: Version
-UpdateCheckMode: Tags ^v[\d.]+-\d+-wallet$
+UpdateCheckMode: Tags ^v[\d.]+-\d+-wallet-fdroid$
 CurrentVersion: 2.7.0
-CurrentVersionCode: 2700
+CurrentVersionCode: 2701