diff --git a/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt b/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt
index d9e87dab23..c89b99651c 100644
--- a/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt
+++ b/metadata/com.greenaddress.greenbits_android_wallet.testnet.txt
@@ -9,22 +9,18 @@ Name:GreenBits Testnet
 Auto Name:GreenBits
 Summary:GreenAddress Testnet client
 Description:
-GreenBits Testnet is a Bitcoin Wallet for Android provided by GreenAddress for
-the Testnet network.
+'''This app has been deprecated as it has been merged into
+[[com.greenaddress.greenbits_android_wallet]].'''
+
+Original description: GreenBits Testnet is a Bitcoin Wallet for Android provided
+by GreenAddress for the Testnet network.
 
 The wallet main strengths are security, privacy, easy of use and aims is to
 provide a great user experience.
 
-* It supports the payment protocol via both click and qrcode scanning and instant confirmation.
+* It supports the payment protocol via both click and qrcode scanning.
 * Supports paper wallet scanning in both WIF and BIP38 format.
 * Uses multisignature for improved security and per transaction two factor authentication.
-
-Please note that another GreenAddress app is available for Android: it has more
-features available however it consumes more resources and even on recent Android
-devices it may not be as good of a user experience as this new Android native
-version.
-
-You can find it at [[it.greenaddress.cordova]].
 .
 
 Repo Type:git
@@ -224,7 +220,11 @@ Build:2.05_testnet,205
     build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
     ndk=r17b
 
-Auto Update Mode:Version r%v
-Update Check Mode:Tags
+Maintainer Notes:
+This app has been merged in com.greenaddress.greenbits.
+.
+
+Auto Update Mode:None
+Update Check Mode:None
 Current Version:2.05_testnet
 Current Version Code:205
diff --git a/metadata/com.greenaddress.greenbits_android_wallet.txt b/metadata/com.greenaddress.greenbits_android_wallet.txt
index bf64f0888b..819f51f4b3 100644
--- a/metadata/com.greenaddress.greenbits_android_wallet.txt
+++ b/metadata/com.greenaddress.greenbits_android_wallet.txt
@@ -13,16 +13,9 @@ GreenBits is a Bitcoin Wallet for Android provided by GreenAddress.
 The wallet main strengths are security, privacy, easy of use and aims is to
 provide a great user experience.
 
-* It supports the payment protocol via both click and qrcode scanning and instant confirmation.
+* It supports the payment protocol via both click and qrcode scanning.
 * Supports paper wallet scanning in both WIF and BIP38 format.
 * Uses multisignature for improved security and per transaction two factor authentication.
-
-Please note that another GreenAddress app is available for Android: it has more
-features available however it consumes more resources and even on recent Android
-devices it may not be as good of a user experience as this new Android native
-version.
-
-You can find it at [[it.greenaddress.cordova]].
 .
 
 Repo Type:git
@@ -687,10 +680,9 @@ Build:2.06,206
     subdir=app
     gradle=production
     forcevercode=yes
-    prebuild=sed -i -e 's/enable true/enable false/g' build.gradle && \
-        sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle
-    scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/production/assets/checkpoints
-    scandelete=app/src/btctestnet/assets/checkpoints
+    prebuild=sed -i -e 's/output.versionCodeOverride =/0 + /g' build.gradle
+    scanignore=bitcoinj/core/src/main/resources/org/bitcoinj/crypto/cacerts,bitcoinj/core/src/test,app/src/main/assets/production/checkpoints
+    scandelete=app/src/main/assets/btctestnet/checkpoints
     build=JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") sh ./prepare_fdroid.sh
     ndk=r17b