diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
index b133c72db23..7619e93f5dd 100644
--- a/res/linux/org.mixxx.Mixxx.metainfo.xml
+++ b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -59,31 +59,31 @@
   </provides>
   <screenshots>
     <screenshot type="default">
-      <image>https://mixxx.org/theme/images/2.3/screenshots/latenight-palemoon-3840x2160.png</image>
+      <image>https://mixxx.org/theme/images/2.3/screenshots/latenight-palemoon-1600x1200.png</image>
       <caption>Mixxx with the default LateNight PaleMoon skin</caption>
     </screenshot>
     <screenshot>
-      <image>https://mixxx.org/theme/images/2.3/screenshots/latenight-classic-3840x2160.png</image>
+      <image>https://mixxx.org/theme/images/2.3/screenshots/latenight-classic-1600x1200.png</image>
       <caption>Mixxx with the LateNight Classic skin</caption>
     </screenshot>
     <screenshot>
-      <image>https://mixxx.org/theme/images/2.3/screenshots/deere-3840x2160.png</image>
+      <image>https://mixxx.org/theme/images/2.3/screenshots/deere-1600x1200.png</image>
       <caption>Mixxx with the Deere skin</caption>
     </screenshot>
     <screenshot>
-      <image>https://mixxx.org/theme/images/2.3/screenshots/shade-classic-3840x2160.png</image>
+      <image>https://mixxx.org/theme/images/2.3/screenshots/shade-classic-1600x1200.png</image>
       <caption>Mixxx with the Shade Classic skin</caption>
     </screenshot>
     <screenshot>
-      <image>https://mixxx.org/theme/images/2.3/screenshots/shade-dark-3840x2160.png</image>
+      <image>https://mixxx.org/theme/images/2.3/screenshots/shade-dark-1600x1200.png</image>
       <caption>Mixxx with the Shade Dark skin</caption>
     </screenshot>
     <screenshot>
-      <image>https://mixxx.org/theme/images/2.3/screenshots/shade-summersunset-3840x2160.png</image>
+      <image>https://mixxx.org/theme/images/2.3/screenshots/shade-summersunset-1600x1200.png</image>
       <caption>Mixxx with the Shade Summer Sunset skin</caption>
     </screenshot>
     <screenshot>
-      <image>https://mixxx.org/theme/images/2.3/screenshots/tango-3840x2160.png</image>
+      <image>https://mixxx.org/theme/images/2.3/screenshots/tango-1600x1200.png</image>
       <caption>Mixxx with the Tango skin</caption>
     </screenshot>
   </screenshots>
@@ -260,13 +260,9 @@
  <ul>
   <li>
    It is no longer necessary to manually copy the udev rule file in packaging scripts. Now pkg-config is used to determine the udevdir used to install the rules file in the CMake install step when CMAKE_INSTALL_PREFIX is
-   <code>
-    /
-   </code>
+   /
    or
-   <code>
-    /usr
-   </code>
+   /usr
    .
    #4126
   </li>
@@ -553,9 +549,7 @@
  <ul>
   <li>
    Add support for searching for empty fields (for example
-   <code>
-    crate:""
-   </code>
+   crate:""
    )
    lp:1788086
   </li>
@@ -794,26 +788,18 @@
  <ul>
   <li>
    Add CMake build system with
-   <code>
-    ccache
-   </code>
+   ccache
    and
-   <code>
-    sccache
-   </code>
+   sccache
    support for faster compilation times and remove SCons
    #2280
    #3618
   </li>
   <li>
    Make Mixxx compile even though
-   <code>
-    QT_NO_OPENGL
-   </code>
+   QT_NO_OPENGL
    or
-   <code>
-    QT_OPENGL_ES_2
-   </code>
+   QT_OPENGL_ES_2
    is defined (fixes build on Raspberry Pi)
    lp:1863440
    #2504
@@ -845,9 +831,7 @@
   </li>
   <li>
    Derive Mixxx version from
-   <code>
-    git describe
-   </code>
+   git describe
    #3824
    #3841
    #3848
diff --git a/tools/update_metainfo.py b/tools/update_metainfo.py
index bf01ed82f77..1ae0e857663 100755
--- a/tools/update_metainfo.py
+++ b/tools/update_metainfo.py
@@ -49,6 +49,13 @@ def parse_changelog(content):
             new_tag = soup.new_tag("p")
             new_tag.string = tag.get_text()
             tag.replace_with(new_tag)
+
+        # Although the `<code>` tag is theoretically supported, it apparently
+        # leads to parser errors when using `appstream-util validate-relax` (as
+        # of version 0.7.18).
+        for tag in soup.find_all("code"):
+            tag.replace_with(tag.get_text())
+
         desc = soup.new_tag("description")
         desc.extend(soup.contents)