diff --git a/.github/workflows/linux_build_flatpak.yml b/.github/workflows/linux_build_flatpak.yml
index cf0e7dc8ef..137639eae1 100644
--- a/.github/workflows/linux_build_flatpak.yml
+++ b/.github/workflows/linux_build_flatpak.yml
@@ -60,6 +60,11 @@ jobs:
           submodules: recursive
           set-safe-directory: ${{ env.GITHUB_WORKSPACE }}
 
+      # Work around container ownership issue
+      - name: Set Safe Directory
+        shell: bash
+        run: git config --global --add safe.directory "*"
+
       # Hackity hack. When running the workflow on a schedule, we don't have the tag,
       # it doesn't fetch tags, therefore we don't get a version. So grab them manually.
       # actions/checkout elides tags, fetch them primarily for releases
@@ -92,7 +97,6 @@ jobs:
 
       - name: Generate AppStream XML
         run: |
-          git config --global --add safe.directory "*"
           ./.github/workflows/scripts/linux/generate-metainfo.sh .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
           cat .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml
           flatpak-builder-lint appstream .github/workflows/scripts/linux/flatpak/net.pcsx2.PCSX2.metainfo.xml