diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml
index f36fe942a..2411ca04b 100644
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@@ -315,17 +315,24 @@ jobs:
         arch: x86_64
         build-bundle: true
         verbose: true
-        #mirror-screenshots-url: https://dl.flathub.org/media
-        #branch: ${{ inputs.branch }}
-        branch: master
+        mirror-screenshots-url: https://dl.flathub.org/media
+        branch: beta
         cache: true
         restore-cache: true
         cache-key: flatpak-x64-${{ hashFiles('scripts/flatpak/**/*.json') }}
 
-    # fails due to screenshots..
-    #- name: Validate build
-    #  run: |
-    #    flatpak-builder-lint repo repo
+    - name: Push to Flathub
+      #if: github.ref == 'refs/heads/dev'
+      uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+      with:
+        flat-manager-url: https://hub.flathub.org/
+        repository: beta
+        token: ${{ secrets.FLATHUB_BETA_TOKEN }}
+        build-log-url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+    - name: Validate build
+      run: |
+        flatpak-builder-lint repo repo
 
     - name: Upload Flatpak
       uses: actions/upload-artifact@v1
diff --git a/scripts/org.duckstation.DuckStation.metainfo.xml.in b/scripts/org.duckstation.DuckStation.metainfo.xml.in
index 0d5ea193e..435dbbb04 100644
--- a/scripts/org.duckstation.DuckStation.metainfo.xml.in
+++ b/scripts/org.duckstation.DuckStation.metainfo.xml.in
@@ -20,12 +20,17 @@
   <screenshots>
     <screenshot type="default">
       <image>https://raw.githubusercontent.com/stenzek/duckstation/md-images/main-qt.png</image>
+      <caption>Desktop Interface</caption>
     </screenshot>
     <screenshot>
       <image>https://raw.githubusercontent.com/stenzek/duckstation/md-images/bigduck.png</image>
+      <caption>Big Picture Mode Interface</caption>
     </screenshot>
   </screenshots>
   <releases>
     <release version="@GIT_VERSION@" date="@GIT_DATE@" />
   </releases>
+  <custom>
+    <value key="flathub::manifest">https://raw.githubusercontent.com/stenzek/duckstation/@GIT_HASH@/scripts/flatpak/org.duckstation.DuckStation.json</value>
+  </custom>
 </component>