diff --git a/.github/workflows/electron-master.yml b/.github/workflows/electron-master.yml
index 3a2d222c4e..0dc428c76a 100644
--- a/.github/workflows/electron-master.yml
+++ b/.github/workflows/electron-master.yml
@@ -52,14 +52,13 @@ jobs:
           sudo flatpak install org.freedesktop.Sdk//24.08 -y
           sudo flatpak install org.freedesktop.Platform//24.08 -y
           sudo flatpak install org.electronjs.Electron2.BaseApp//24.08 -y
+          sudo flatpak install org.flatpak.Builder -y
 
           METAINFO_FILE="packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml"
           TODAY=$(date +%Y-%m-%d)
           VERSION=${{ steps.process_version.outputs.version }}
           sed -i "s/%RELEASE_VERSION%/$VERSION/g; s/%RELEASE_DATE%/$TODAY/g" "$METAINFO_FILE"
-          sudo apt-get install appstream
-          appstreamcli --version
-          appstreamcli validate "$METAINFO_FILE"
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream "$METAINFO_FILE"
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Build Electron for Mac
diff --git a/.github/workflows/electron-pr.yml b/.github/workflows/electron-pr.yml
index e181ef015c..0b405c03e1 100644
--- a/.github/workflows/electron-pr.yml
+++ b/.github/workflows/electron-pr.yml
@@ -52,14 +52,13 @@ jobs:
           sudo flatpak install org.freedesktop.Sdk//24.08 -y
           sudo flatpak install org.freedesktop.Platform//24.08 -y
           sudo flatpak install org.electronjs.Electron2.BaseApp//24.08 -y
+          sudo flatpak install org.flatpak.Builder -y
 
           METAINFO_FILE="packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml"
           TODAY=$(date +%Y-%m-%d)
           VERSION=$(node ./packages/ci-actions/bin/get-next-package-version.js --package-json ./packages/desktop-electron/package.json --type nightly)
           sed -i "s/%RELEASE_VERSION%/$VERSION/g; s/%RELEASE_DATE%/$TODAY/g" "$METAINFO_FILE"
-          sudo apt-get install appstream
-          appstreamcli --version
-          appstreamcli validate "$METAINFO_FILE"
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream "$METAINFO_FILE"
       - name: Set up environment
         uses: ./.github/actions/setup
       - name: Build Electron
diff --git a/.github/workflows/publish-nightly-electron.yml b/.github/workflows/publish-nightly-electron.yml
index 69953bc1bf..bbe443edb1 100644
--- a/.github/workflows/publish-nightly-electron.yml
+++ b/.github/workflows/publish-nightly-electron.yml
@@ -49,14 +49,13 @@ jobs:
           sudo flatpak install org.freedesktop.Sdk//24.08 -y
           sudo flatpak install org.freedesktop.Platform//24.08 -y
           sudo flatpak install org.electronjs.Electron2.BaseApp//24.08 -y
+          sudo flatpak install org.flatpak.Builder -y
 
           METAINFO_FILE="packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml"
           TODAY=$(date +%Y-%m-%d)
           VERSION=$(node ./packages/ci-actions/bin/get-next-package-version.js --package-json ./packages/desktop-electron/package.json --type nightly)
           sed -i "s/%RELEASE_VERSION%/$VERSION/g; s/%RELEASE_DATE%/$TODAY/g" "$METAINFO_FILE"
-          sudo apt-get install appstream
-          appstreamcli --version
-          appstreamcli validate "$METAINFO_FILE"
+          flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream "$METAINFO_FILE"
       - name: Set up environment
         uses: ./.github/actions/setup
 
diff --git a/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml b/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml
index 2298f1c68d..2a56560135 100644
--- a/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml
+++ b/packages/desktop-electron/extra-resources/linux/com.actualbudget.actual.metainfo.xml
@@ -21,6 +21,7 @@
   <launchable type="desktop-id">com.actualbudget.actual.desktop</launchable>
   <url type="homepage">https://actualbudget.org/</url>
   <url type="bugtracker">https://github.com/actualbudget/actual/issues</url>
+  <url type="vcs-browser">https://github.com/actualbudget/actual</url>
   <recommends>
     <control>keyboard</control>
     <control>pointing</control>
@@ -68,6 +69,9 @@
       </description>
     </release>
   </releases>
-  <developer_name>Actual Core Contributors</developer_name>
+
+  <developer id="com.actualbudget">
+    <name>Actual Core Contributors</name>
+  </developer>
   <update_contact>dev@actualbudget.org</update_contact>
 </component>
diff --git a/upcoming-release-notes/6593.md b/upcoming-release-notes/6593.md
new file mode 100644
index 0000000000..ffd6adb39b
--- /dev/null
+++ b/upcoming-release-notes/6593.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MikesGlitch]
+---
+
+Switch flathub validation to flatpak-builder-lint for metainfo validations