diff --git a/metadata/app.intra.yml b/metadata/app.intra.yml
index 55837d7b50..43c5516250 100644
--- a/metadata/app.intra.yml
+++ b/metadata/app.intra.yml
@@ -10,7 +10,6 @@ SourceCode: https://github.com/Jigsaw-Code/Intra
IssueTracker: https://github.com/Jigsaw-Code/Intra/issues
AutoName: Intra
-Summary: Encrypted DNS client
Description: |-
Intra is an experimental tool that allows you to test new DNS-over-HTTPS
services that encrypt domain name lookups and prevent manipulation by your
diff --git a/metadata/app.intra/en-US/summary.txt b/metadata/app.intra/en-US/summary.txt
new file mode 100644
index 0000000000..b2f18f3e18
--- /dev/null
+++ b/metadata/app.intra/en-US/summary.txt
@@ -0,0 +1 @@
+Encrypted DNS client
diff --git a/metadata/com.github.shadowsocks.tv.yml b/metadata/com.github.shadowsocks.tv.yml
index d6c2c657b1..a1a1bd5f15 100644
--- a/metadata/com.github.shadowsocks.tv.yml
+++ b/metadata/com.github.shadowsocks.tv.yml
@@ -12,7 +12,6 @@ Translation: https://poeditor.com/join/project/u5VHO9vhSf
Changelog: https://github.com/shadowsocks/shadowsocks-android/releases
AutoName: Shadowsocks
-Summary: A shadowsocks client for TV
Description: |-
A shadowsocks client for Android TV. Shadowsocks is a fast tunnel proxy that
helps you bypass firewalls.
diff --git a/metadata/com.github.shadowsocks.tv/en-US/summary.txt b/metadata/com.github.shadowsocks.tv/en-US/summary.txt
new file mode 100644
index 0000000000..31fb88acd0
--- /dev/null
+++ b/metadata/com.github.shadowsocks.tv/en-US/summary.txt
@@ -0,0 +1 @@
+A shadowsocks client for TV
diff --git a/metadata/com.github.shadowsocks.yml b/metadata/com.github.shadowsocks.yml
index e5cef65800..87b4dc0458 100644
--- a/metadata/com.github.shadowsocks.yml
+++ b/metadata/com.github.shadowsocks.yml
@@ -12,7 +12,6 @@ Translation: https://poeditor.com/join/project/u5VHO9vhSf
Changelog: https://github.com/shadowsocks/shadowsocks-android/releases
AutoName: Shadowsocks
-Summary: A shadowsocks client
Description: |-
A shadowsocks client for Android. Shadowsocks is a fast tunnel proxy that
helps you bypass firewalls. QR code scanning function is patched out due to
diff --git a/metadata/com.github.shadowsocks/en-US/summary.txt b/metadata/com.github.shadowsocks/en-US/summary.txt
new file mode 100644
index 0000000000..e26a827016
--- /dev/null
+++ b/metadata/com.github.shadowsocks/en-US/summary.txt
@@ -0,0 +1 @@
+A shadowsocks client
diff --git a/metadata/com.jefftharris.passwdsafe.yml b/metadata/com.jefftharris.passwdsafe.yml
index 8b8a68e452..02c5421990 100644
--- a/metadata/com.jefftharris.passwdsafe.yml
+++ b/metadata/com.jefftharris.passwdsafe.yml
@@ -10,7 +10,6 @@ Changelog: https://sourceforge.net/p/passwdsafe/news/
Donate: https://www.paypal.com/cgi-bin/webscr?item_name=Donation+to+PasswdSafe&cmd=_donations&business=jefftharris%40gmail.com
AutoName: PasswdSafe
-Summary: Port of PasswordSafe password manager
Description: |-
PasswdSafe is a port of the Password Safe (https://pwsafe.org/)
application to Android. YubiKey NEO tokens are supported for two-factor authentication.
diff --git a/metadata/com.jefftharris.passwdsafe/en-US/summary.txt b/metadata/com.jefftharris.passwdsafe/en-US/summary.txt
new file mode 100644
index 0000000000..88d07f858e
--- /dev/null
+++ b/metadata/com.jefftharris.passwdsafe/en-US/summary.txt
@@ -0,0 +1 @@
+Port of PasswordSafe password manager
diff --git a/metadata/gov.anzong.androidnga.yml b/metadata/gov.anzong.androidnga.yml
index 0c31eb4404..fd01c5859d 100644
--- a/metadata/gov.anzong.androidnga.yml
+++ b/metadata/gov.anzong.androidnga.yml
@@ -11,7 +11,6 @@ SourceCode: https://github.com/Justwen/NGA-CLIENT-VER-OPEN-SOURCE
IssueTracker: https://github.com/Justwen/NGA-CLIENT-VER-OPEN-SOURCE/issues
AutoName: NGA
-Summary: NGA client
Description: |-
An FOSS client for National Gay Alliance forum.
diff --git a/metadata/gov.anzong.androidnga/en-US/summary.txt b/metadata/gov.anzong.androidnga/en-US/summary.txt
new file mode 100644
index 0000000000..fcc852df9e
--- /dev/null
+++ b/metadata/gov.anzong.androidnga/en-US/summary.txt
@@ -0,0 +1 @@
+NGA client
diff --git a/metadata/me.mgerdes.open_golf.yml b/metadata/me.mgerdes.open_golf.yml
index 38b5d1e0a5..a628909c21 100644
--- a/metadata/me.mgerdes.open_golf.yml
+++ b/metadata/me.mgerdes.open_golf.yml
@@ -4,7 +4,6 @@ License: MIT
SourceCode: https://github.com/mgerdes/Open-Golf
IssueTracker: https://github.com/mgerdes/Open-Golf/issues
-Summary: A mini golf game currently featuring about 20 levels
Description: Beat all the levels and try to compete to get the lowest score on each!
RepoType: git
diff --git a/metadata/me.mgerdes.open_golf/en-US/summary.txt b/metadata/me.mgerdes.open_golf/en-US/summary.txt
new file mode 100644
index 0000000000..ec3790ae80
--- /dev/null
+++ b/metadata/me.mgerdes.open_golf/en-US/summary.txt
@@ -0,0 +1 @@
+A mini golf game currently featuring about 20 levels
diff --git a/metadata/network.loki.messenger.fdroid.yml b/metadata/network.loki.messenger.fdroid.yml
index b4ccba6597..7dcae34824 100644
--- a/metadata/network.loki.messenger.fdroid.yml
+++ b/metadata/network.loki.messenger.fdroid.yml
@@ -14,7 +14,6 @@ Translation: https://crowdin.com/project/session-android
Changelog: https://github.com/oxen-io/session-android/releases
AutoName: Session
-Summary: Encrypted private messenger
Description: |-
This is an unofficial rebrand of Session without Firebase push service so the
"fast mode" can't
diff --git a/metadata/network.loki.messenger.fdroid/en-US/summary.txt b/metadata/network.loki.messenger.fdroid/en-US/summary.txt
new file mode 100644
index 0000000000..91271bb870
--- /dev/null
+++ b/metadata/network.loki.messenger.fdroid/en-US/summary.txt
@@ -0,0 +1 @@
+Encrypted private messenger
diff --git a/metadata/onlymash.flexbooru.play.yml b/metadata/onlymash.flexbooru.play.yml
index 7b1a74dab3..84c6178d0f 100644
--- a/metadata/onlymash.flexbooru.play.yml
+++ b/metadata/onlymash.flexbooru.play.yml
@@ -12,7 +12,6 @@ IssueTracker: https://github.com/flexbooru/flexbooru/issues
Translation: https://crowdin.com/project/flexbooru
AutoName: Flexbooru
-Summary: A booru client, support Danbooru, Moebooru, Gelbooru, Shimmie
Description: |-
A booru client for Android, support Danbooru, Moebooru, Gelbooru, Shimmie.
QR code scanning function is patched out due to non-free dependencies.
diff --git a/metadata/onlymash.flexbooru.play/en-US/summary.txt b/metadata/onlymash.flexbooru.play/en-US/summary.txt
new file mode 100644
index 0000000000..eb4763ec06
--- /dev/null
+++ b/metadata/onlymash.flexbooru.play/en-US/summary.txt
@@ -0,0 +1 @@
+A booru client, support Danbooru, Moebooru, Gelbooru, Shimmie
diff --git a/metadata/org.ietf.ietfsched.yml b/metadata/org.ietf.ietfsched.yml
index 2cf459e6c1..b56fe4a925 100644
--- a/metadata/org.ietf.ietfsched.yml
+++ b/metadata/org.ietf.ietfsched.yml
@@ -8,7 +8,6 @@ SourceCode: https://github.com/ietf/ietfsched
IssueTracker: https://github.com/ietf/ietfsched/issues
AutoName: IETF 113
-Summary: IETF schedule application for meetings
Description: |-
The Internet Engineering Task Force (IETF) is a large open international community of network designers, operators, vendors, and researchers concerned with the evolution of the Internet architecture and the smooth operation of the Internet. It is open to any interested individual.
diff --git a/metadata/org.ietf.ietfsched/en-US/summary.txt b/metadata/org.ietf.ietfsched/en-US/summary.txt
new file mode 100644
index 0000000000..3a41342373
--- /dev/null
+++ b/metadata/org.ietf.ietfsched/en-US/summary.txt
@@ -0,0 +1 @@
+IETF schedule application for meetings