diff --git a/metadata/com.gianlu.aria2android.yml b/metadata/com.gianlu.aria2android.yml
index c32b927ae9..6156358c3c 100644
--- a/metadata/com.gianlu.aria2android.yml
+++ b/metadata/com.gianlu.aria2android.yml
@@ -4,6 +4,7 @@ License: GPL-3.0-only
 SourceCode: https://github.com/devgianlu/Aria2Android
 IssueTracker: https://github.com/devgianlu/Aria2Android/issues
 Donate: https://www.paypal.me/devgianlu
+LiberapayID: 1381702
 
 AutoName: Aria2Android
 
diff --git a/metadata/com.gianlu.dnshero.txt b/metadata/com.gianlu.dnshero.txt
deleted file mode 100644
index ad00025c5a..0000000000
--- a/metadata/com.gianlu.dnshero.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-AntiFeatures:NonFreeNet
-Categories:Internet
-License:GPL-3.0-only
-Web Site:
-Source Code:https://github.com/devgianlu/DNSHero
-Issue Tracker:https://github.com/devgianlu/DNSHero/issues
-Donate:https://www.paypal.me/devgianlu
-
-Auto Name:DNS Hero
-
-Repo Type:git
-Repo:https://github.com/devgianlu/DNSHero
-
-Build:1.0.5-foss,6
-    commit=v1.0.5
-    subdir=app
-    gradle=foss
-    srclibs=CommonUtils@a89ffaebd726b747d0cfcb4c67b66b5abfc5a9a2
-    prebuild=sed -i -e '/maven.fabric.io/d' ../build.gradle && \
-        sed -i -e 's#../CommonUtils#app/$$CommonUtils$$#' ../settings.gradle
-
-Build:1.1.3,10
-    commit=v1.1.3
-    subdir=app
-    submodules=yes
-    gradle=foss
-    prebuild=sed -i -e '/maven.fabric.io/d' ../build.gradle ../CommonUtils/build.gradle
-
-Build:1.2.0,11
-    commit=v1.2.0
-    subdir=app
-    submodules=yes
-    gradle=foss
-    prebuild=sed -i -e '/maven.fabric.io/d' ../build.gradle ../CommonUtils/build.gradle
-
-Build:1.2.3,13
-    commit=v1.2.3
-    subdir=app
-    submodules=yes
-    gradle=foss
-    prebuild=sed -i -e '/maven.fabric.io/d' ../build.gradle ../CommonUtils/build.gradle
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:1.2.3
-Current Version Code:13
diff --git a/metadata/com.gianlu.dnshero.yml b/metadata/com.gianlu.dnshero.yml
new file mode 100644
index 0000000000..d6e03b7b7c
--- /dev/null
+++ b/metadata/com.gianlu.dnshero.yml
@@ -0,0 +1,61 @@
+AntiFeatures:
+  - NonFreeNet
+Categories:
+  - Internet
+License: GPL-3.0-only
+SourceCode: https://github.com/devgianlu/DNSHero
+IssueTracker: https://github.com/devgianlu/DNSHero/issues
+Donate: https://www.paypal.me/devgianlu
+LiberapayID: '1381702'
+
+AutoName: DNS Hero
+
+RepoType: git
+Repo: https://github.com/devgianlu/DNSHero
+
+Builds:
+  - versionName: 1.0.5-foss
+    versionCode: 6
+    commit: v1.0.5
+    subdir: app
+    gradle:
+      - foss
+    srclibs:
+      - CommonUtils@a89ffaebd726b747d0cfcb4c67b66b5abfc5a9a2
+    prebuild: |-
+        sed -i -e '/maven.fabric.io/d' ../build.gradle && sed -i -e 's#../CommonUtils#app/$$CommonUtils$$#' ../settings.gradle
+
+  - versionName: 1.1.3
+    versionCode: 10
+    commit: v1.1.3
+    subdir: app
+    submodules: true
+    gradle:
+      - foss
+    prebuild: |-
+        sed -i -e '/maven.fabric.io/d' ../build.gradle ../CommonUtils/build.gradle
+
+  - versionName: 1.2.0
+    versionCode: 11
+    commit: v1.2.0
+    subdir: app
+    submodules: true
+    gradle:
+      - foss
+    prebuild: |-
+        sed -i -e '/maven.fabric.io/d' ../build.gradle ../CommonUtils/build.gradle
+
+  - versionName: 1.2.3
+    versionCode: 13
+    commit: v1.2.3
+    subdir: app
+    submodules: true
+    gradle:
+      - foss
+    prebuild: |-
+        sed -i -e '/maven.fabric.io/d' ../build.gradle ../CommonUtils/build.gradle
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 1.2.3
+CurrentVersionCode: 13