diff --git a/data/meson.build b/data/meson.build
index fced285..95a8f2d 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -88,6 +88,16 @@ appstream_file = i18n.merge_file(
   install_dir: iv_datadir / 'metainfo'
 )
 
+# Validate Appdata
+appstreamcli = find_program('appstreamcli', required: false)
+if (appstreamcli.found())
+  test('Validate metainfo file',
+    appstreamcli,
+    args: ['validate', '--no-net', appstream_file],
+    workdir: meson.current_build_dir()
+  )
+endif
+
 subdir('icons')
 
 # GSchema
diff --git a/data/org.gnome.Loupe.metainfo.xml.in.in b/data/org.gnome.Loupe.metainfo.xml.in.in
index 8254ec7..14cfb8f 100644
--- a/data/org.gnome.Loupe.metainfo.xml.in.in
+++ b/data/org.gnome.Loupe.metainfo.xml.in.in
@@ -4,7 +4,11 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
   <name>Image Viewer</name>
+  <!-- developer_name tag deprecated with Appstream 1.0 -->
   <developer_name>The Loupe Team</developer_name>
+  <developer id="gnome.org">
+    <name>The Loupe Team</name>
+  </developer>
   <summary>View images</summary>
   <description>
     <p>Browse through your images and inspect their metadata with:</p>
@@ -54,7 +58,6 @@
   <content_rating type="oars-1.1" />
   <custom>
     <value key="GnomeSoftware::key-colors">[(208, 105, 167)]</value>
-    <value key="Purism::form_factor">workstation</value>
     <value key="Purism::form_factor">mobile</value>
   </custom>