diff --git a/.github/workflows/appstream-check.yaml b/.github/workflows/appstream-check.yaml
index f74a49fc4f..4f9864c53a 100644
--- a/.github/workflows/appstream-check.yaml
+++ b/.github/workflows/appstream-check.yaml
@@ -14,16 +14,19 @@ jobs:
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - name: Install appstream validator
+      - name: Install appstream validator and flatpak Builder
         shell: bash
         run: |
           sudo apt update -y
           sudo apt install -y \
               flatpak
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-          # We get it from flathub to ensure we have a recent version
-          sudo flatpak install -y org.freedesktop.appstream-glib
+          sudo flatpak install -y org.freedesktop.appstream-glib org.flatpak.Builder
 
       - name: Validate appstream data
         shell: bash
         run: flatpak run org.freedesktop.appstream-glib validate --nonet packaging/app.organicmaps.desktop.metainfo.xml
+
+      - name: Lint appstream data with flatpak Builder
+        shell: bash
+        run: flatpak run --command=flatpak-builder-lint org.flatpak.Builder appstream packaging/app.organicmaps.desktop.metainfo.xml