diff --git a/data/meson.build b/data/meson.build
index a6a574b6..ab348d7f 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -14,12 +14,12 @@ i18n.merge_file(
 )
 
 i18n.merge_file(
-    input: 'wingpanel.appdata.xml.in',
-    output: meson.project_name() + '.appdata.xml',
-    po_dir: join_paths(meson.project_source_root(), 'po', 'extra'),
+    input: 'wingpanel.metainfo.xml.in',
+    output: meson.project_name() + '.metainfo.xml',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo'),
+    install_dir: get_option('datadir') / 'metainfo',
 )
 
 # Use GResource
diff --git a/data/wingpanel.appdata.xml.in b/data/wingpanel.metainfo.xml.in
similarity index 56%
rename from data/wingpanel.appdata.xml.in
rename to data/wingpanel.metainfo.xml.in
index 1fa77f2c..b3f7c7a8 100644
--- a/data/wingpanel.appdata.xml.in
+++ b/data/wingpanel.metainfo.xml.in
@@ -3,13 +3,37 @@
 <component>
   <id>io.elementary.wingpanel</id>
   <metadata_license>CC0-1.0</metadata_license>
-  <project_group>elementary</project_group>
   <project_license>GPL-3.0+</project_license>
+
   <name>Wingpanel</name>
   <summary>Top panel that holds indicators and the applications menu</summary>
   <description>
     <p>The extensible top panel for Pantheon. Wingpanel is an empty container that accepts indicators as extensions, including the applications menu.</p>
   </description>
+  <compulsory_for_desktop>Pantheon</compulsory_for_desktop>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/elementary/wingpanel/3.0.5/data/screenshot.png</image>
+    </screenshot>
+  </screenshots>
+
+  <provides>
+    <binary>io.elementary.wingpanel</binary>
+  </provides>
+
+
+  <url type="homepage">https://elementary.io/</url>
+  <url type="bugtracker">https://github.com/elementary/wingpanel/issues</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://elementaryos.stackexchange.com/questions/tagged/wingpanel</url>
+  <url type="translate">https://l10n.elementary.io/projects/wingpanel</url>
+
+  <developer id="org.elementaryos">
+    <name>elementary, Inc.</name>
+  </developer>
+  <project_group>elementary</project_group>
+  <update_contact>contact_AT_elementary.io</update_contact>
 
   <releases>
     <release version="3.0.5" date="2023-09-13" urgency="medium">
@@ -48,6 +72,7 @@
         </ul>
       </description>
     </release>
+
     <release version="3.0.2" date="2021-12-18" urgency="medium">
       <description>
         <p>Improvements:</p>
@@ -57,6 +82,7 @@
         </ul>
       </description>
     </release>
+
     <release version="3.0.1" date="2021-09-27" urgency="medium">
       <description>
         <p>Improvements:</p>
@@ -65,85 +91,11 @@
         </ul>
       </description>
     </release>
-    <release version="3.0.0" date="2021-07-13" urgency="medium">
-      <description>
-        <p>Improvements:</p>
-        <ul>
-          <li>Fix some issues with indicator sort order</li>
-          <li>Adjust special icon colors for dark and light panels to improve contrast</li>
-          <li>Fix getting monitor dimensions under Wayland</li>
-          <li>Hide tooltips when indicators are open</li>
-          <li>Updated translations</li>
-        </ul>
-        <p>Deprecations:</p>
-        <ul>
-          <li>Wingpanel.Widgets.Container: Use Gtk.ModelButton instead</li>
-          <li>Wingpanel.Widgets.Separator: Use Gtk.Separator instead</li>
-          <li>Wingpanel.Widgets.Switch: Use Granite.SwitchModelButton instead</li>
-        </ul>
-        <p>Removals:</p>
-        <ul>
-          <li>Wingpanel.Widgets.AutomaticScrollBox: use Gtk.ScrolledWindow.max_content_height instead</li>
-          <li>Wingpanel.Widgets.Button: Use Gtk.ModelButton instead</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.3.2" date="2020-06-19" urgency="medium">
-      <description>
-        <p>Improvements:</p>
-        <ul>
-          <li>Fix a potential issue when ending the session</li>
-          <li>Use "allowed" and "forbidden" list names</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.3.1" date="2020-04-05" urgency="medium">
-      <description>
-        <p>Improvements:</p>
-        <ul>
-          <li>Fix an issue with some 3 monitor layouts</li>
-          <li>Reduce spacing between icons</li>
-          <li>Add support for mutter 3.36</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.3.0" date="2020-03-02" urgency="medium">
-      <description>
-        <p>Improvements:</p>
-        <ul>
-          <li>Fix an issue where moving windows to a secondary display above the panel wouldn't work</li>
-          <li>Register with session manager</li>
-          <li>Add support for mutter 3.3x</li>
-          <li>Updated translations</li>
-        </ul>
-      </description>
-    </release>
-    <release version="2.2.6" date="2019-10-31" urgency="medium">
-      <description>
-        <p>Fix an issue with the panel being draggable on touch screens</p>
-        <p>Fix focus on dialogs launched from the panel</p>
-        <p>Updated translations</p>
-      </description>
-    </release>
+
+    <release version="3.0.0" date="2021-07-13" />
+    <release version="2.3.2" date="2020-06-19" />
+    <release version="2.3.1" date="2020-04-05" />
+    <release version="2.3.0" date="2020-03-02" />
+    <release version="2.2.6" date="2019-10-31" />
   </releases>
-  <provides>
-    <binary>io.elementary.wingpanel</binary>
-  </provides>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/wingpanel/3.0.5/data/screenshot.png</image>
-    </screenshot>
-  </screenshots>
-  <compulsory_for_desktop>Pantheon</compulsory_for_desktop>
-  <developer id="org.elementaryos">
-    <name>elementary, Inc.</name>
-  </developer>
-  <url type="homepage">https://elementary.io/</url>
-  <url type="bugtracker">https://github.com/elementary/wingpanel/issues</url>
-  <url type="donation">https://elementary.io/get-involved#funding</url>
-  <url type="help">https://elementaryos.stackexchange.com/questions/tagged/wingpanel</url>
-  <url type="translate">https://l10n.elementary.io/projects/wingpanel</url>
-  <update_contact>contact_AT_elementary.io</update_contact>
 </component>
diff --git a/po/extra/POTFILES b/po/extra/POTFILES
index c62547e0..6fcbb2a7 100644
--- a/po/extra/POTFILES
+++ b/po/extra/POTFILES
@@ -1 +1,2 @@
 data/wingpanel.desktop.in
+data/wingpanel.metainfo.xml.in