diff --git a/metadata/org.btcmap.yml b/metadata/org.btcmap.yml
index 3cbde84ecb..e033c258ea 100644
--- a/metadata/org.btcmap.yml
+++ b/metadata/org.btcmap.yml
@@ -172,26 +172,18 @@ Builds:
     preassemble:
       - bundleData
 
-  - versionName: 0.4.6
-    versionCode: 21
-    disable: https://github.com/teambtcmap/btcmap-android/issues/27
-    commit: ddc3ed923ee43bbce9362a39ff8ef68eb3f19c2a
-    subdir: app
-    gradle:
-      - fdroid
-    preassemble:
-      - bundleData
-
   - versionName: 0.4.7
     versionCode: 22
     commit: 764953bd0609069b59bbc64b1ed9b3715fe3533e
     subdir: app
     gradle:
       - fdroid
+      - selfSigned
+    prebuild: sed -i -e '/signingConfig /d' build.gradle.kts
     preassemble:
       - bundleData
 
-AutoUpdateMode: Version v%v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 0.4.7
 CurrentVersionCode: 22
diff --git a/metadata/org.epstudios.epmobile.yml b/metadata/org.epstudios.epmobile.yml
index 87a3f423f8..eb4c356f3e 100644
--- a/metadata/org.epstudios.epmobile.yml
+++ b/metadata/org.epstudios.epmobile.yml
@@ -270,10 +270,6 @@ Builds:
     versionCode: 76
     commit: 54a71eedfb59b55d4989d2e5605b04ab9265e00a
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - yes
     prebuild: sed -i -e '/unsafe/d' ../gradle.properties