diff --git a/metadata/com.dessalines.thumbkey.yml b/metadata/com.dessalines.thumbkey.yml
index a16d5aea5a..c80316edf7 100644
--- a/metadata/com.dessalines.thumbkey.yml
+++ b/metadata/com.dessalines.thumbkey.yml
@@ -286,16 +286,9 @@ Builds:
     gradle:
       - yes
 
-  - versionName: 3.1.6
-    versionCode: 83
-    disable: https://github.com/dessalines/thumb-key/issues/400
-    commit: 18f42ab9b0d1003a58cf2ac82932172b72ec9cdf
-    subdir: app
-    gradle:
-      - yes
-
   - versionName: 3.1.7
     versionCode: 84
+    disable: https://github.com/dessalines/thumb-key/issues/400
     commit: 28b048bdfc4eff5a0c2e9e87c61d72a27322843c
     subdir: app
     gradle:
diff --git a/metadata/net.i2p.android.router.yml b/metadata/net.i2p.android.router.yml
index e11bb33c93..e57c4945ff 100644
--- a/metadata/net.i2p.android.router.yml
+++ b/metadata/net.i2p.android.router.yml
@@ -824,6 +824,29 @@ Builds:
     gradleprops:
       - I2P_VERSION=2.5.0
 
+  - versionName: 2.5.2
+    versionCode: 4745283
+    commit: ea68f116e16fa8025d72c61d9cb9be9a2fa56264
+    subdir: app
+    sudo:
+      - apt-get update
+      - apt-get install -y ant gettext
+    gradle:
+      - legacy
+    srclibs:
+      - I2P@168c4ffe4f620b5c5f7b568f20059c72ecf0d94e
+    rm:
+      - gradle/wrapper
+    prebuild:
+      - echo -e "i2psrc=$$I2P$$" >> ../lib/client/local.properties
+      - echo -e "sdk.dir=$$SDK$$\nndk.dir=$$NDK$$\ni2psrc=$$I2P$$" >> ../routerjars/local.properties
+      - cp -R $$I2P$$ ../i2p.i2p
+      - sed -i -e '/abortOnError/acheckReleaseBuilds false' build.gradle
+    scandelete:
+      - lib/client/src/main/jniLibs
+      - i2p.i2p
+    ndk: r19c
+
 AutoUpdateMode: None
 UpdateCheckMode: Tags
 UpdateCheckData: app/build.gradle|versionCode (\d+)|gradle.properties|I2P_ANDROID_VERSION=([\d.]+)
diff --git a/metadata/org.fitchfamily.android.gsmlocation.yml b/metadata/org.fitchfamily.android.gsmlocation.yml
index 61f5755ca2..fd51e5ebde 100644
--- a/metadata/org.fitchfamily.android.gsmlocation.yml
+++ b/metadata/org.fitchfamily.android.gsmlocation.yml
@@ -8,20 +8,7 @@ SourceCode: https://gitlab.com/deveee/Local-GSM-Backend
 IssueTracker: https://gitlab.com/deveee/Local-GSM-Backend/-/issues
 Changelog: https://gitlab.com/deveee/Local-GSM-Backend/-/blob/HEAD/CHANGELOG.md
 
-Name: LocalGsmNlpBackend
 AutoName: GSM Location Service
-Description: |-
-  https://f-droid.org/packages/com.google.android.gms backend that uses local GSM data to resolve user
-  location.
-
-  A facility in the setting menu allows you to create a database using data from
-  <a href="http://opencellid.org">OpenCellId</a> and/or <a href="https://location.services.mozilla.com
-  Mozilla">Location Services</a> CSV files. Alternatively, the on-phone database can
-  be generated in advance via the <a href="https://github.com/n76/lacells-creator">lacells-creator</a> scripts that gather tower information from those two sources,
-  too.
-
-  This backend performs no network data. All data acquired by the phone stays on
-  the phone and no queries are made to a centralized AP location provider.
 
 RepoType: git
 Repo: https://gitlab.com/deveee/Local-GSM-Backend.git
@@ -421,6 +408,11 @@ Builds:
     versionCode: 74
     commit: 5f6207cf51e3aaa3151232e746321d719252b534
     subdir: app
+    sudo:
+      - echo "deb https://deb.debian.org/debian bullseye main" > /etc/apt/sources.list.d/bullseye.list
+      - apt-get update
+      - apt-get install -y -t bullseye openjdk-11-jdk-headless
+      - update-java-alternatives --set java-1.11.0-openjdk-amd64
     gradle:
       - yes
 
diff --git a/metadata/org.fitchfamily.android.gsmlocation/cs/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/cs/summary.txt
deleted file mode 100644
index 8b8fe19924..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/cs/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Zprostředkovatel polohy UnifiedNlp (místní databáze GSM)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/de/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/de/summary.txt
deleted file mode 100644
index 038066b974..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/de/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Standortprovider für UnifiedNlp (lokale GSM-Datenbank)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/en-US/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/en-US/summary.txt
deleted file mode 100644
index b80421ca5f..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/en-US/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedNlp location provider (local GSM database)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/es/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/es/summary.txt
deleted file mode 100644
index 0ce68eace8..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/es/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Proveedor de localización UnifiedNlp (base de datos GSM local)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/fr/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/fr/summary.txt
deleted file mode 100644
index 3f19f1eb10..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/fr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fournisseur de localisation UnifiedNlp (base de données GSM locale)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/he/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/he/summary.txt
deleted file mode 100644
index 1058103da8..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/he/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-ספק מיקום UnifiedNlp (מסד נתונים GSM מקומי)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/it/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/it/summary.txt
deleted file mode 100644
index b21a46e7ed..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/it/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedNlp location provider (banca dati locale GSM)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/pl/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/pl/summary.txt
deleted file mode 100644
index d744cda2bf..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/pl/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Dostawca lokalizacji UnifiedNlp (lokalna baza danych GSM)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/pt-BR/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/pt-BR/summary.txt
deleted file mode 100644
index 22a2860330..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/pt-BR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Provedor de localização UnifiedNlp (banco de dados GSM local)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/pt-PT/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/pt-PT/summary.txt
deleted file mode 100644
index 22a2860330..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Provedor de localização UnifiedNlp (banco de dados GSM local)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/pt/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/pt/summary.txt
deleted file mode 100644
index 22a2860330..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/pt/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Provedor de localização UnifiedNlp (banco de dados GSM local)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/ro/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/ro/summary.txt
deleted file mode 100644
index bec8bb3ba0..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/ro/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Furnizor de localizare UnifiedNlp (bază de date GSM locală)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/ru/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/ru/summary.txt
deleted file mode 100644
index bed3eff6ff..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/ru/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Поставщик местоположения UnifiedNlp (локальная база данных GSM)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/sw/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/sw/summary.txt
deleted file mode 100644
index a72401c75a..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/sw/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kitoa huduma ya eneo cha UnifiedNlp (kihifadhidata cha ndani cha GSM)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/tr/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/tr/summary.txt
deleted file mode 100644
index 0b996ca7f9..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/tr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedNlp konum sağlayıcısı (yerel GSM veritabanı)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/uk/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/uk/summary.txt
deleted file mode 100644
index 6bd8f08375..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Постачальник місцезнаходження UnifiedNlp (локальна база даних GSM)
diff --git a/metadata/org.fitchfamily.android.gsmlocation/zh-CN/summary.txt b/metadata/org.fitchfamily.android.gsmlocation/zh-CN/summary.txt
deleted file mode 100644
index f0c58b1cc4..0000000000
--- a/metadata/org.fitchfamily.android.gsmlocation/zh-CN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-UnifiedNlp 位置提供程序（本地 GSM 数据库）