diff --git a/metadata/com.etesync.syncadapter.txt b/metadata/com.etesync.syncadapter.txt
deleted file mode 100644
index a3d365fa92..0000000000
--- a/metadata/com.etesync.syncadapter.txt
+++ /dev/null
@@ -1,440 +0,0 @@
-Categories:Security,System,Internet
-License:GPL-3.0-only
-Author Email:android@etesync.com
-Web Site:https://www.etesync.com
-Source Code:https://github.com/etesync/android
-Issue Tracker:https://github.com/etesync/android/issues
-Changelog:https://github.com/etesync/android/blob/HEAD/ChangeLog.md
-
-Auto Name:EteSync
-
-Repo Type:git
-Repo:https://github.com/etesync/android
-
-Build:0.8.0,1
-    commit=v0.8.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e '/android-reporting/d' -e '/classpath/d' -e '/dependencies/aclasspath "com.android.tools.build:gradle:2.2.0"' ../build.gradle
-
-Build:0.8.1,2
-    commit=v0.8.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-    prebuild=sed -i -e '/android-reporting/d' -e '/classpath/d' -e '/dependencies/aclasspath "com.android.tools.build:gradle:2.2.0"' ../build.gradle
-
-Build:0.9.1,4
-    commit=v0.9.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.9.2,5
-    commit=v0.9.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.10.0,6
-    commit=v0.10.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.11.0,7
-    commit=v0.11.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.11.1,8
-    commit=v0.11.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.12.0,9
-    commit=v0.12.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.13.0,10
-    commit=v0.13.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.14.0,11
-    commit=v0.14.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.15.0,12
-    commit=v0.15.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.16.0,13
-    commit=v0.16.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.18.0,15
-    commit=v0.18.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.18.1,16
-    commit=v0.18.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.18.2,17
-    commit=v0.18.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.19.1,19
-    commit=v0.19.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.19.2,20
-    commit=v0.19.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.19.3,21
-    commit=v0.19.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.19.4,22
-    commit=v0.19.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.19.5,23
-    commit=v0.19.5
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.19.6,24
-    commit=v0.19.6
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.20.0,25
-    disable=old and failing
-    commit=v0.20.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.20.1,26
-    commit=v0.20.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.20.2,27
-    commit=v0.20.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.20.3,28
-    commit=v0.20.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.20.4,29
-    commit=0.20.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.21.0,30
-    commit=v0.21.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.21.1,31
-    commit=v0.21.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.21.2,32
-    commit=v0.21.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.21.4,34
-    commit=v0.21.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.21.5,35
-    commit=v0.21.5
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.21.6,36
-    commit=v0.21.6
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.22.0,37
-    commit=v0.22.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.22.1,38
-    commit=v0.22.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.22.2,39
-    commit=v0.22.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.22.3,40
-    commit=v0.22.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.22.4,41
-    commit=v0.22.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.22.5,42
-    commit=v0.22.5
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:0.22.6,43
-    commit=v0.22.6
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.0.0,50
-    commit=v1.0.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.0.1,51
-    commit=v1.0.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.0.2,52
-    commit=v1.0.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.0.3,53
-    commit=v1.0.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.0.4,54
-    commit=v1.0.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.1.0,55
-    commit=v1.1.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.0,56
-    commit=v1.2.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.1,57
-    commit=v1.2.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.2,58
-    commit=v1.2.2
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.3,59
-    commit=v1.2.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.5,61
-    commit=v1.2.5
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.2.6,62
-    commit=v1.2.6
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.3.0,63
-    commit=v1.3.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.0,65
-    commit=v1.4.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.1,66
-    commit=v1.4.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.3,68
-    commit=v1.4.3
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.4,69
-    commit=v1.4.4
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.5,70
-    commit=v1.4.5
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.6,71
-    commit=v1.4.6
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.7,72
-    commit=v1.4.7
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.8,73
-    commit=v1.4.8
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.9,74
-    commit=v1.4.9
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.10,75
-    commit=v1.4.10
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.11,76
-    commit=v1.4.11
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.4.12,77
-    commit=v1.4.12
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.5.0,78
-    commit=v1.5.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.5.1,79
-    commit=v1.5.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.6.0,80
-    commit=v1.6.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.6.1,81
-    commit=v1.6.1
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Build:1.7.0,82
-    commit=v1.7.0
-    subdir=app
-    submodules=yes
-    gradle=yes
-
-Maintainer Notes:
-Summary and Description are maintained by upstream using fastlane in
-the source repo:
-https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
-.
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.7.0
-Current Version Code:82
diff --git a/metadata/com.etesync.syncadapter.yml b/metadata/com.etesync.syncadapter.yml
new file mode 100644
index 0000000000..ad7dbddbff
--- /dev/null
+++ b/metadata/com.etesync.syncadapter.yml
@@ -0,0 +1,583 @@
+Categories:
+  - Security
+  - System
+  - Internet
+License: GPL-3.0-only
+AuthorEmail: android@etesync.com
+WebSite: https://www.etesync.com
+SourceCode: https://github.com/etesync/android
+IssueTracker: https://github.com/etesync/android/issues
+Changelog: https://github.com/etesync/android/blob/HEAD/ChangeLog.md
+
+AutoName: EteSync
+
+RepoType: git
+Repo: https://github.com/etesync/android
+
+Builds:
+  - versionName: 0.8.0
+    versionCode: 1
+    commit: v0.8.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild: sed -i -e '/android-reporting/d' -e '/classpath/d' -e '/dependencies/aclasspath
+        "com.android.tools.build:gradle:2.2.0"' ../build.gradle
+
+  - versionName: 0.8.1
+    versionCode: 2
+    commit: v0.8.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+    prebuild: sed -i -e '/android-reporting/d' -e '/classpath/d' -e '/dependencies/aclasspath
+        "com.android.tools.build:gradle:2.2.0"' ../build.gradle
+
+  - versionName: 0.9.1
+    versionCode: 4
+    commit: v0.9.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.9.2
+    versionCode: 5
+    commit: v0.9.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.10.0
+    versionCode: 6
+    commit: v0.10.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.11.0
+    versionCode: 7
+    commit: v0.11.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.11.1
+    versionCode: 8
+    commit: v0.11.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.12.0
+    versionCode: 9
+    commit: v0.12.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.13.0
+    versionCode: 10
+    commit: v0.13.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.14.0
+    versionCode: 11
+    commit: v0.14.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.15.0
+    versionCode: 12
+    commit: v0.15.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.16.0
+    versionCode: 13
+    commit: v0.16.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.18.0
+    versionCode: 15
+    commit: v0.18.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.18.1
+    versionCode: 16
+    commit: v0.18.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.18.2
+    versionCode: 17
+    commit: v0.18.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.19.1
+    versionCode: 19
+    commit: v0.19.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.19.2
+    versionCode: 20
+    commit: v0.19.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.19.3
+    versionCode: 21
+    commit: v0.19.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.19.4
+    versionCode: 22
+    commit: v0.19.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.19.5
+    versionCode: 23
+    commit: v0.19.5
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.19.6
+    versionCode: 24
+    commit: v0.19.6
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.20.0
+    versionCode: 25
+    disable: old and failing
+    commit: v0.20.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.20.1
+    versionCode: 26
+    commit: v0.20.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.20.2
+    versionCode: 27
+    commit: v0.20.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.20.3
+    versionCode: 28
+    commit: v0.20.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.20.4
+    versionCode: 29
+    commit: 0.20.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.21.0
+    versionCode: 30
+    commit: v0.21.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.21.1
+    versionCode: 31
+    commit: v0.21.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.21.2
+    versionCode: 32
+    commit: v0.21.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.21.4
+    versionCode: 34
+    commit: v0.21.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.21.5
+    versionCode: 35
+    commit: v0.21.5
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.21.6
+    versionCode: 36
+    commit: v0.21.6
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.22.0
+    versionCode: 37
+    commit: v0.22.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.22.1
+    versionCode: 38
+    commit: v0.22.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.22.2
+    versionCode: 39
+    commit: v0.22.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.22.3
+    versionCode: 40
+    commit: v0.22.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.22.4
+    versionCode: 41
+    commit: v0.22.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.22.5
+    versionCode: 42
+    commit: v0.22.5
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 0.22.6
+    versionCode: 43
+    commit: v0.22.6
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.0.0
+    versionCode: 50
+    commit: v1.0.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.0.1
+    versionCode: 51
+    commit: v1.0.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.0.2
+    versionCode: 52
+    commit: v1.0.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.0.3
+    versionCode: 53
+    commit: v1.0.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.0.4
+    versionCode: 54
+    commit: v1.0.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.1.0
+    versionCode: 55
+    commit: v1.1.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.0
+    versionCode: 56
+    commit: v1.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.1
+    versionCode: 57
+    commit: v1.2.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.2
+    versionCode: 58
+    commit: v1.2.2
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.3
+    versionCode: 59
+    commit: v1.2.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.5
+    versionCode: 61
+    commit: v1.2.5
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.2.6
+    versionCode: 62
+    commit: v1.2.6
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.3.0
+    versionCode: 63
+    commit: v1.3.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.0
+    versionCode: 65
+    commit: v1.4.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.1
+    versionCode: 66
+    commit: v1.4.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.3
+    versionCode: 68
+    commit: v1.4.3
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.4
+    versionCode: 69
+    commit: v1.4.4
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.5
+    versionCode: 70
+    commit: v1.4.5
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.6
+    versionCode: 71
+    commit: v1.4.6
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.7
+    versionCode: 72
+    commit: v1.4.7
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.8
+    versionCode: 73
+    commit: v1.4.8
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.9
+    versionCode: 74
+    commit: v1.4.9
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.10
+    versionCode: 75
+    commit: v1.4.10
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.11
+    versionCode: 76
+    commit: v1.4.11
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.4.12
+    versionCode: 77
+    commit: v1.4.12
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.5.0
+    versionCode: 78
+    commit: v1.5.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.5.1
+    versionCode: 79
+    commit: v1.5.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.6.0
+    versionCode: 80
+    commit: v1.6.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.6.1
+    versionCode: 81
+    commit: v1.6.1
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+  - versionName: 1.7.0
+    versionCode: 82
+    commit: v1.7.0
+    subdir: app
+    submodules: true
+    gradle:
+      - yes
+
+MaintainerNotes: |-
+    Summary and Description are maintained by upstream using fastlane in
+    the source repo:
+    https://f-droid.org/docs/All_About_Descriptions_Graphics_and_Screenshots
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.7.0
+CurrentVersionCode: 82
diff --git a/metadata/com.everysoft.autoanswer.txt b/metadata/com.everysoft.autoanswer.txt
deleted file mode 100644
index 27fbd20ec4..0000000000
--- a/metadata/com.everysoft.autoanswer.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Categories:Phone & SMS
-License:GPL-3.0-only
-Web Site:
-Source Code:https://archive.softwareheritage.org/browse/origin/http://auto-answer.googlecode.com/svn//directory/
-Issue Tracker:
-
-Auto Name:AutoAnswer
-Summary:Auto-answer phone calls
-Description:
-AutoAnswer is a very simple android application to answer the phone
-automatically when it rings. Can be limited to just contacts or starred
-contacts. Also has a speakerphone option.
-.
-
-Build:1.1,2
-    commit=5
-    target=android-8
-
-Build:1.2,3
-    commit=9
-    target=android-8
-
-Build:1.4,5
-    commit=12
-    target=android-8
-
-Build:1.5,6
-    commit=17
-    target=android-8
-
-Auto Update Mode:None
-Update Check Mode:Static
-Current Version:1.5
-Current Version Code:6
diff --git a/metadata/com.everysoft.autoanswer.yml b/metadata/com.everysoft.autoanswer.yml
new file mode 100644
index 0000000000..9e69c911b0
--- /dev/null
+++ b/metadata/com.everysoft.autoanswer.yml
@@ -0,0 +1,37 @@
+Categories:
+  - Phone & SMS
+License: GPL-3.0-only
+SourceCode: https://archive.softwareheritage.org/browse/origin/http://auto-answer.googlecode.com/svn//directory/
+
+AutoName: AutoAnswer
+Summary: Auto-answer phone calls
+Description: |-
+    AutoAnswer is a very simple android application to answer the phone
+    automatically when it rings. Can be limited to just contacts or starred
+    contacts. Also has a speakerphone option.
+
+Builds:
+  - versionName: '1.1'
+    versionCode: 2
+    commit: '5'
+    target: android-8
+
+  - versionName: '1.2'
+    versionCode: 3
+    commit: '9'
+    target: android-8
+
+  - versionName: '1.4'
+    versionCode: 5
+    commit: '12'
+    target: android-8
+
+  - versionName: '1.5'
+    versionCode: 6
+    commit: '17'
+    target: android-8
+
+AutoUpdateMode: None
+UpdateCheckMode: Static
+CurrentVersion: '1.5'
+CurrentVersionCode: 6
diff --git a/metadata/com.example.tobiastrumm.freifunkautoconnect.txt b/metadata/com.example.tobiastrumm.freifunkautoconnect.txt
deleted file mode 100644
index d86d962c20..0000000000
--- a/metadata/com.example.tobiastrumm.freifunkautoconnect.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-Categories:System
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/WIStudent/FreifunkAutoConnectApp
-Issue Tracker:https://github.com/WIStudent/FreifunkAutoConnectApp/issues
-Changelog:https://github.com/WIStudent/FreifunkAutoConnectApp/blob/HEAD/CHANGELOG.md
-
-Auto Name:Freifunk Auto Connect
-Summary:Add multiple Freifunk SSIDs to your device
-Description:
-Compantion tool that makes it easier to add multiple Freifunk SSIDs to the
-network configuration of your device.
-.
-
-Repo Type:git
-Repo:https://github.com/WIStudent/FreifunkAutoConnectApp
-
-Build:0.4,4
-    commit=v0.4
-    subdir=app
-    gradle=yes
-
-Build:0.5,5
-    commit=v0.5
-    subdir=app
-    gradle=yes
-
-Build:0.6,6
-    disable=play-services
-    commit=v0.6
-    subdir=app
-    gradle=yes
-
-Build:0.6.1,7
-    commit=v0.6.1
-    subdir=app
-    gradle=yes
-    rm=app/libs/*.jar
-
-Build:0.7,8
-    commit=v0.7
-    subdir=app
-    gradle=yes
-    rm=app/libs/*.jar
-
-Build:0.8,9
-    commit=v0.8
-    subdir=app
-    gradle=yes
-    rm=app/libs/*.jar
-
-Build:0.9,10
-    commit=v0.9
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.9
-Current Version Code:10
diff --git a/metadata/com.example.tobiastrumm.freifunkautoconnect.yml b/metadata/com.example.tobiastrumm.freifunkautoconnect.yml
new file mode 100644
index 0000000000..c5b5c02464
--- /dev/null
+++ b/metadata/com.example.tobiastrumm.freifunkautoconnect.yml
@@ -0,0 +1,77 @@
+Categories:
+  - System
+License: GPL-3.0-only
+SourceCode: https://github.com/WIStudent/FreifunkAutoConnectApp
+IssueTracker: https://github.com/WIStudent/FreifunkAutoConnectApp/issues
+Changelog: https://github.com/WIStudent/FreifunkAutoConnectApp/blob/HEAD/CHANGELOG.md
+
+AutoName: Freifunk Auto Connect
+Summary: Add multiple Freifunk SSIDs to your device
+Description: |-
+    Compantion tool that makes it easier to add multiple Freifunk SSIDs to the
+    network configuration of your device.
+
+RepoType: git
+Repo: https://github.com/WIStudent/FreifunkAutoConnectApp
+
+Builds:
+  - versionName: '0.4'
+    versionCode: 4
+    commit: v0.4
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.5'
+    versionCode: 5
+    commit: v0.5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '0.6'
+    versionCode: 6
+    disable: play-services
+    commit: v0.6
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.6.1
+    versionCode: 7
+    commit: v0.6.1
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*.jar
+
+  - versionName: '0.7'
+    versionCode: 8
+    commit: v0.7
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*.jar
+
+  - versionName: '0.8'
+    versionCode: 9
+    commit: v0.8
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*.jar
+
+  - versionName: '0.9'
+    versionCode: 10
+    commit: v0.9
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: '0.9'
+CurrentVersionCode: 10
diff --git a/metadata/com.f0x.eddymalou.txt b/metadata/com.f0x.eddymalou.txt
deleted file mode 100644
index 302e164300..0000000000
--- a/metadata/com.f0x.eddymalou.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Categories:Multimedia
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/F0x06/EddyMalou
-Issue Tracker:https://github.com/F0x06/EddyMalou/issues
-
-Auto Name:Eddy Malou
-Summary:Eddy Malou sound board
-Description:
-[https://en.wikipedia.org/wiki/Soundboard_%28computer_program%29 Soundboard]
-featuring Eddy Malou.
-.
-
-Repo Type:git
-Repo:https://github.com/F0x06/EddyMalou.git
-
-Build:1.0,1
-    commit=1.0
-
-Build:2.0,2
-    commit=2.0
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.0
-Current Version Code:2
diff --git a/metadata/com.f0x.eddymalou.yml b/metadata/com.f0x.eddymalou.yml
new file mode 100644
index 0000000000..83c6818642
--- /dev/null
+++ b/metadata/com.f0x.eddymalou.yml
@@ -0,0 +1,28 @@
+Categories:
+  - Multimedia
+License: GPL-3.0-only
+SourceCode: https://github.com/F0x06/EddyMalou
+IssueTracker: https://github.com/F0x06/EddyMalou/issues
+
+AutoName: Eddy Malou
+Summary: Eddy Malou sound board
+Description: |-
+    [https://en.wikipedia.org/wiki/Soundboard_%28computer_program%29 Soundboard]
+    featuring Eddy Malou.
+
+RepoType: git
+Repo: https://github.com/F0x06/EddyMalou.git
+
+Builds:
+  - versionName: '1.0'
+    versionCode: 1
+    commit: '1.0'
+
+  - versionName: '2.0'
+    versionCode: 2
+    commit: '2.0'
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '2.0'
+CurrentVersionCode: 2
diff --git a/metadata/com.fake.android.torchlight.txt b/metadata/com.fake.android.torchlight.txt
deleted file mode 100644
index 500d9dae64..0000000000
--- a/metadata/com.fake.android.torchlight.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-Categories:System
-License:Apache-2.0
-Web Site:https://kb-1000.github.io/
-Source Code:https://github.com/kb-1000/android-torchlight
-Issue Tracker:https://github.com/kb-1000/android-torchlight/issues
-
-Auto Name:Torchlight
-Summary:Use the flash of your camera as a light
-Description:
-This is a privacy-friendly torchlight. It only uses the privileges it really
-needs:
-
-* Camera: to access the camera
-* Flashlight: to use the flashlight on the camera.
-.
-
-Repo Type:git
-Repo:https://github.com/kb-1000/android-torchlight.git
-
-Build:0.02b5,205
-    commit=0.02b5
-    subdir=app
-    gradle=yes
-
-Build:2.6,206
-    commit=2.6
-    subdir=app
-    gradle=yes
-
-Build:2.7,207
-    commit=2.7
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version %v
-Update Check Mode:Tags
-Current Version:2.7
-Current Version Code:207
diff --git a/metadata/com.fake.android.torchlight.yml b/metadata/com.fake.android.torchlight.yml
new file mode 100644
index 0000000000..e38d8cf121
--- /dev/null
+++ b/metadata/com.fake.android.torchlight.yml
@@ -0,0 +1,45 @@
+Categories:
+  - System
+License: Apache-2.0
+WebSite: https://kb-1000.github.io/
+SourceCode: https://github.com/kb-1000/android-torchlight
+IssueTracker: https://github.com/kb-1000/android-torchlight/issues
+
+AutoName: Torchlight
+Summary: Use the flash of your camera as a light
+Description: |-
+    This is a privacy-friendly torchlight. It only uses the privileges it really
+    needs:
+
+    * Camera: to access the camera
+    * Flashlight: to use the flashlight on the camera.
+
+RepoType: git
+Repo: https://github.com/kb-1000/android-torchlight.git
+
+Builds:
+  - versionName: 0.02b5
+    versionCode: 205
+    commit: 0.02b5
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.6'
+    versionCode: 206
+    commit: '2.6'
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: '2.7'
+    versionCode: 207
+    commit: '2.7'
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version %v
+UpdateCheckMode: Tags
+CurrentVersion: '2.7'
+CurrentVersionCode: 207