diff --git a/metadata/org.gdroid.gdroid.txt b/metadata/org.gdroid.gdroid.txt
deleted file mode 100644
index b356558cdf..0000000000
--- a/metadata/org.gdroid.gdroid.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Categories:System
-License:GPL-3.0-or-later
-Author Name:Andreas Redmer
-Author Email:ar-gdroid@abga.be
-Web Site:https://gitlab.com/gdroid/gdroidclient
-Source Code:https://gitlab.com/gdroid/gdroidclient/tree/HEAD
-Issue Tracker:https://gitlab.com/gdroid/gdroidclient/issues
-Changelog:https://gitlab.com/gdroid/gdroidclient/tags
-LiberapayID:1302739
-Bitcoin:1J2bbhJYksSjeynGGhuSPN9aTEaxiGm4nR
-
-Auto Name:G-Droid
-Summary:An alternative client app to browse the F-Droid repository
-Description:
-An alternative client app to browse the F-Droid repository. Has a slighly
-different approach of UI design.
-.
-
-Repo Type:git
-Repo:https://gitlab.com/gdroid/gdroidclient.git
-
-Build:0.1.0,1
-    commit=v0.1.0
-    subdir=app
-    gradle=yes
-
-Build:0.1.1,1001
-    commit=v0.1.1
-    subdir=app
-    gradle=yes
-
-Auto Update Mode:Version v%v
-Update Check Mode:Tags
-Current Version:0.1.1
-Current Version Code:1001
diff --git a/metadata/org.gdroid.gdroid.yml b/metadata/org.gdroid.gdroid.yml
new file mode 100644
index 0000000000..6f31067424
--- /dev/null
+++ b/metadata/org.gdroid.gdroid.yml
@@ -0,0 +1,39 @@
+Categories:
+  - System
+License: GPL-3.0-or-later
+AuthorName: Andreas Redmer
+AuthorEmail: ar-gdroid@abga.be
+SourceCode: https://gitlab.com/gdroid/gdroidclient/
+IssueTracker: https://gitlab.com/gdroid/gdroidclient/issues
+Changelog: https://gitlab.com/gdroid/gdroidclient/tags
+LiberapayID: '302739'
+Bitcoin: 1J2bbhJYksSjeynGGhuSPN9aTEaxiGm4nR
+
+AutoName: G-Droid
+Summary: An alternative client app to browse the F-Droid repository
+Description: |-
+    G-Droid is a client application to browse the F-Droid repository. It has a
+    slighly different approach of UI design to the F-Droid client.
+
+RepoType: git
+Repo: https://gitlab.com/gdroid/gdroidclient.git
+
+Builds:
+  - versionName: 0.1.0
+    versionCode: 1
+    commit: v0.1.0
+    subdir: app
+    gradle:
+      - yes
+
+  - versionName: 0.1.1
+    versionCode: 1001
+    commit: v0.1.1
+    subdir: app
+    gradle:
+      - yes
+
+AutoUpdateMode: Version v%v
+UpdateCheckMode: Tags
+CurrentVersion: 0.1.1
+CurrentVersionCode: 1001