diff --git a/metadata/com.celzero.bravedns.yml b/metadata/com.celzero.bravedns.yml
index 4d5bca9966..1872f24a0d 100644
--- a/metadata/com.celzero.bravedns.yml
+++ b/metadata/com.celzero.bravedns.yml
@@ -40,8 +40,13 @@ Builds:
 
   - versionName: 053i
     versionCode: 20
+    disable: https://github.com/celzero/rethink-app/issues/493
     commit: 4b57f04b4c63a8460b9f3d805d54e67002a22498
     subdir: app
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - fdroid
 
diff --git a/metadata/com.infomaniak.drive.yml b/metadata/com.infomaniak.drive.yml
index 17e4123dd2..cc7618799d 100644
--- a/metadata/com.infomaniak.drive.yml
+++ b/metadata/com.infomaniak.drive.yml
@@ -399,7 +399,7 @@ Builds:
       - sed -i -e '/amazonaws/d' ../build.gradle
       - sed -i -e '/geniusscansdk/d' build.gradle
 
-AutoUpdateMode: None
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 4.2.0
 CurrentVersionCode: 40200011
diff --git a/metadata/org.secuso.privacyfriendlynotes.yml b/metadata/org.secuso.privacyfriendlynotes.yml
index b25d0cade7..7549e2ac3e 100644
--- a/metadata/org.secuso.privacyfriendlynotes.yml
+++ b/metadata/org.secuso.privacyfriendlynotes.yml
@@ -42,6 +42,10 @@ Builds:
     commit: fec349809c284269fe046ed8e09fa71d0372d107
     subdir: app
     submodules: true
+    sudo:
+      - apt-get update || apt-get update
+      - apt-get install -y openjdk-11-jdk-headless
+      - update-alternatives --auto java
     gradle:
       - yes
 
diff --git a/metadata/org.secuso.privacyfriendlynotes/ar/summary.txt b/metadata/org.secuso.privacyfriendlynotes/ar/summary.txt
deleted file mode 100644
index 8de74b6871..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/ar/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-أكتب وأدِر الملاحظات
diff --git a/metadata/org.secuso.privacyfriendlynotes/cs/summary.txt b/metadata/org.secuso.privacyfriendlynotes/cs/summary.txt
deleted file mode 100644
index 590907bb12..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/cs/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pořizujte a spravujte své poznámky
diff --git a/metadata/org.secuso.privacyfriendlynotes/de/summary.txt b/metadata/org.secuso.privacyfriendlynotes/de/summary.txt
deleted file mode 100644
index 7b112553ab..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/de/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Notizen machen und verwalten
diff --git a/metadata/org.secuso.privacyfriendlynotes/en-US/summary.txt b/metadata/org.secuso.privacyfriendlynotes/en-US/summary.txt
deleted file mode 100644
index c5f91c9ced..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/en-US/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Take and manage notes
diff --git a/metadata/org.secuso.privacyfriendlynotes/eo/summary.txt b/metadata/org.secuso.privacyfriendlynotes/eo/summary.txt
deleted file mode 100644
index 39cb0606ea..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/eo/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fari kaj administri notojn
diff --git a/metadata/org.secuso.privacyfriendlynotes/es/summary.txt b/metadata/org.secuso.privacyfriendlynotes/es/summary.txt
deleted file mode 100644
index 9bbaeab8a0..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/es/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tomar y administrar notas
diff --git a/metadata/org.secuso.privacyfriendlynotes/et/summary.txt b/metadata/org.secuso.privacyfriendlynotes/et/summary.txt
deleted file mode 100644
index e18284a9f8..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/et/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Kirjuta ja halda märkmeid
diff --git a/metadata/org.secuso.privacyfriendlynotes/fr/summary.txt b/metadata/org.secuso.privacyfriendlynotes/fr/summary.txt
deleted file mode 100644
index 60c220453d..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/fr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Prennez et gérez vos notes
diff --git a/metadata/org.secuso.privacyfriendlynotes/gd/summary.txt b/metadata/org.secuso.privacyfriendlynotes/gd/summary.txt
deleted file mode 100644
index 7ca6b57cde..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/gd/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Gabh is cuir rian air nòtaichean
diff --git a/metadata/org.secuso.privacyfriendlynotes/he/summary.txt b/metadata/org.secuso.privacyfriendlynotes/he/summary.txt
deleted file mode 100644
index 73533e9016..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/he/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-רישום וניהול פתקיות
diff --git a/metadata/org.secuso.privacyfriendlynotes/is/summary.txt b/metadata/org.secuso.privacyfriendlynotes/is/summary.txt
deleted file mode 100644
index 1a2a3e3c6b..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/is/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Taka niður og sýsla með minnispunkta
diff --git a/metadata/org.secuso.privacyfriendlynotes/it/summary.txt b/metadata/org.secuso.privacyfriendlynotes/it/summary.txt
deleted file mode 100644
index eb60acb8e0..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/it/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Prendi e gestisci note
diff --git a/metadata/org.secuso.privacyfriendlynotes/ja/summary.txt b/metadata/org.secuso.privacyfriendlynotes/ja/summary.txt
deleted file mode 100644
index 5aefe94d3f..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/ja/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-メモを取る、管理する
diff --git a/metadata/org.secuso.privacyfriendlynotes/nb/summary.txt b/metadata/org.secuso.privacyfriendlynotes/nb/summary.txt
deleted file mode 100644
index 0d092c36b5..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/nb/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Skriv ned og håndter notater
diff --git a/metadata/org.secuso.privacyfriendlynotes/pl/summary.txt b/metadata/org.secuso.privacyfriendlynotes/pl/summary.txt
deleted file mode 100644
index c35d2797aa..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/pl/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Rób notatki i zarządzaj nimi
diff --git a/metadata/org.secuso.privacyfriendlynotes/pt-BR/summary.txt b/metadata/org.secuso.privacyfriendlynotes/pt-BR/summary.txt
deleted file mode 100644
index a8f13e8195..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/pt-BR/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tome e gerencia notas
diff --git a/metadata/org.secuso.privacyfriendlynotes/pt-PT/summary.txt b/metadata/org.secuso.privacyfriendlynotes/pt-PT/summary.txt
deleted file mode 100644
index 19aef640ab..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/pt-PT/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Registar e gerir notas
diff --git a/metadata/org.secuso.privacyfriendlynotes/pt/summary.txt b/metadata/org.secuso.privacyfriendlynotes/pt/summary.txt
deleted file mode 100644
index 19aef640ab..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/pt/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Registar e gerir notas
diff --git a/metadata/org.secuso.privacyfriendlynotes/ro/summary.txt b/metadata/org.secuso.privacyfriendlynotes/ro/summary.txt
deleted file mode 100644
index edb41571d1..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/ro/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Luați și gestionați notițe
diff --git a/metadata/org.secuso.privacyfriendlynotes/ru/summary.txt b/metadata/org.secuso.privacyfriendlynotes/ru/summary.txt
deleted file mode 100644
index 12f7d5bd5b..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/ru/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Делайте заметки и управляйте ими
diff --git a/metadata/org.secuso.privacyfriendlynotes/sw/summary.txt b/metadata/org.secuso.privacyfriendlynotes/sw/summary.txt
deleted file mode 100644
index 87a7e3bd93..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/sw/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Chukua na uendeshe madokezo
diff --git a/metadata/org.secuso.privacyfriendlynotes/tr/summary.txt b/metadata/org.secuso.privacyfriendlynotes/tr/summary.txt
deleted file mode 100644
index 7b08c8e3a6..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/tr/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Not alma ve yönetme
diff --git a/metadata/org.secuso.privacyfriendlynotes/uk/summary.txt b/metadata/org.secuso.privacyfriendlynotes/uk/summary.txt
deleted file mode 100644
index 20c9e25524..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/uk/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Створюйте та керуйте примітками
diff --git a/metadata/org.secuso.privacyfriendlynotes/vi/summary.txt b/metadata/org.secuso.privacyfriendlynotes/vi/summary.txt
deleted file mode 100644
index 3bfce7af7f..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/vi/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-Tạo và quản lý ghi chú
diff --git a/metadata/org.secuso.privacyfriendlynotes/zh-CN/summary.txt b/metadata/org.secuso.privacyfriendlynotes/zh-CN/summary.txt
deleted file mode 100644
index d3e4a722db..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/zh-CN/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-记录和管理笔记
diff --git a/metadata/org.secuso.privacyfriendlynotes/zh-TW/summary.txt b/metadata/org.secuso.privacyfriendlynotes/zh-TW/summary.txt
deleted file mode 100644
index 86a1f71ad1..0000000000
--- a/metadata/org.secuso.privacyfriendlynotes/zh-TW/summary.txt
+++ /dev/null
@@ -1 +0,0 @@
-記錄和管理筆記