diff --git a/metadata/org.videolan.vlc.txt b/metadata/org.videolan.vlc.txt
index 529cfe77ed..99246504f6 100644
--- a/metadata/org.videolan.vlc.txt
+++ b/metadata/org.videolan.vlc.txt
@@ -1183,61 +1183,6 @@ Build:2.0.6,12000605
         ./compile.sh -a "x86" --release
     ndk=r11c
 
-Build:2.0.6,12000624
-    disable=last resort
-    commit=2.0.6
-    output=binary/vlc.apk
-    build=mkdir binary && \
-        cd binary && \
-        wget -c https://get.videolan.org/vlc-android/$$VERSION$$/VLC-Android-$$VERSION$$-ARMv7.apk -O vlc.apk && \
-        unzip vlc.apk && \
-        rm -fR META-INF vlc.apk && \
-        zip -r vlc.apk *
-
-Build:2.0.6,12000625
-    disable=last resort
-    commit=2.0.6
-    output=binary/vlc.apk
-    build=mkdir binary && \
-        cd binary && \
-        wget -c https://get.videolan.org/vlc-android/$$VERSION$$/VLC-Android-$$VERSION$$-x86.apk -O vlc.apk && \
-        unzip vlc.apk && \
-        rm -fR META-INF vlc.apk && \
-        zip -r vlc.apk *
-
-Build:2.0.6,12000626
-    disable=last resort
-    commit=2.0.6
-    output=binary/vlc.apk
-    build=mkdir binary && \
-        cd binary && \
-        wget -c https://get.videolan.org/vlc-android/$$VERSION$$/VLC-Android-$$VERSION$$-MIPS.apk -O vlc.apk && \
-        unzip vlc.apk && \
-        rm -fR META-INF vlc.apk && \
-        zip -r vlc.apk *
-
-Build:2.0.6,12000627
-    disable=last resort
-    commit=2.0.6
-    output=binary/vlc.apk
-    build=mkdir binary && \
-        cd binary && \
-        wget -c https://get.videolan.org/vlc-android/$$VERSION$$/VLC-Android-$$VERSION$$-ARMv8.apk -O vlc.apk && \
-        unzip vlc.apk && \
-        rm -fR META-INF vlc.apk && \
-        zip -r vlc.apk *
-
-Build:2.0.6,12000628
-    disable=last resort
-    commit=2.0.6
-    output=binary/vlc.apk
-    build=mkdir binary && \
-        cd binary && \
-        wget -c https://get.videolan.org/vlc-android/$$VERSION$$/VLC-Android-$$VERSION$$-x86_64.apk -O vlc.apk && \
-        unzip vlc.apk && \
-        rm -fR META-INF vlc.apk && \
-        zip -r vlc.apk *
-
 Maintainer Notes:
 Instructions and dependencies here: http://wiki.videolan.org/AndroidCompile
 see http://buildbot.videolan.org/builders /for version code scheme
@@ -1246,15 +1191,31 @@ The VLC srclib commit can be found out from TESTED_HASH value in compile.sh
 For recommended versions of the build tools, see:
 https://git.videolan.org/?p=vlc.git;a=blob;f=extras/tools/bootstrap;h=e60e5ebf93e69e7bb731e80d0fbc6ebd1226dfdb;hb=HEAD#l73
 
-On new releases remove the updatecheck and force the CV to the last working
-build. This will make sure users don't get notified about the update until
-the final build from the BS has been reviewed and tested. Once done, undo
-those changes.
+Next build should use ndk13 and skip out-of-band downloading.
+
+Actual versioncodes are:
+
+* Build:2.0.6,12000624 armv7
+* Build:2.0.6,12000625 x86
+* Build:2.0.6,12000626 mips
+* Build:2.0.6,12000627 armv8
+* Build:2.0.6,12000628 x86_64
+
+A last-resort update option if builds keep broken for a long time is to
+resign official apks:
+
+    commit=2.0.6
+    output=binary/vlc.apk
+    build=mkdir binary && \
+        cd binary && \
+        wget -c https://get.videolan.org/vlc-android/$$VERSION$$/VLC-Android-$$VERSION$$-x86_64.apk -O vlc.apk && \
+        unzip vlc.apk && \
+        rm -fR META-INF vlc.apk && \
+        zip -r vlc.apk *
 .
 
-Archive Policy:0 versions
+Archive Policy:3 versions
 Auto Update Mode:None
-Update Check Mode:None
-Vercode Operation:%c + 5
-Current Version:1.9.0
-Current Version Code:1090005
+Update Check Mode:Static
+Current Version:2.0.6
+Current Version Code:12000605