diff --git a/taskcluster/ci/fetch/toolchains.yml b/taskcluster/ci/fetch/toolchains.yml
index cdda4e37d26f..bbb84d389ba2 100644
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -604,7 +604,7 @@ symbol-scrapers:
     fetch:
         type: git
         repo: http://github.com/mozilla/symbol-scrapers
-        revision: f61d24345d27760a5c2dc8f9370368bdaa9a4e82
+        revision: d2c090f6580da3bd0a512a87ac174514cc21197c
 
 cpython-3.8.10:
     description: cpython 3.8.10 source code
diff --git a/taskcluster/ci/system-symbols/kind.yml b/taskcluster/ci/system-symbols/kind.yml
index eed2bd696463..7e8e87dfb12b 100644
--- a/taskcluster/ci/system-symbols/kind.yml
+++ b/taskcluster/ci/system-symbols/kind.yml
@@ -150,6 +150,30 @@ jobs:
         fetches:
             fetch:
                 - symbol-scrapers
+    flatpak:
+        description: Extract Firefox Flatpak symbols found in crashreports
+        attributes:
+            build_platform: firefox-flatpak
+        index:
+            product: system-symbols
+            job-name: firefox-flatpak
+            type: generic
+        worker:
+            artifacts:
+                - name: public/build
+                  type: directory
+                  path: /builds/worker/artifacts/
+            docker-image: {in-tree: system-symbols-linux-scraper}
+            max-run-time: 14400
+        run:
+            using: run-task
+            command: >-
+                ./run.sh firefox-flatpak
+        treeherder:
+            symbol: firefox-symbols-fltpk
+        fetches:
+            fetch:
+                - symbol-scrapers
     gnome-sdk-snap:
         description: Extract GNOME SDK Snap symbols found in crashreports
         attributes:
diff --git a/taskcluster/docker/firefox-flatpak/runme.sh b/taskcluster/docker/firefox-flatpak/runme.sh
index 91511fe2d601..da9ade89453c 100755
--- a/taskcluster/docker/firefox-flatpak/runme.sh
+++ b/taskcluster/docker/firefox-flatpak/runme.sh
@@ -25,6 +25,10 @@ export DATE
 SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 TARGET_TAR_XZ_FULL_PATH="$ARTIFACTS_DIR/target.flatpak.tar.xz"
 SOURCE_DEST="${WORKSPACE}/source"
+
+# When updating this, please make sure to keep in sync the script for symbol
+# scraping at
+# https://github.com/mozilla/symbol-scrapers/blob/master/firefox-flatpak/script.sh
 FREEDESKTOP_VERSION="22.08"
 FIREFOX_BASEAPP_CHANNEL="22.08"
 
diff --git a/taskcluster/docker/system-symbols-linux-scraper/Dockerfile b/taskcluster/docker/system-symbols-linux-scraper/Dockerfile
index 1b2c340ff0cb..6f6e55a0a317 100644
--- a/taskcluster/docker/system-symbols-linux-scraper/Dockerfile
+++ b/taskcluster/docker/system-symbols-linux-scraper/Dockerfile
@@ -10,10 +10,13 @@ WORKDIR /builds/worker
 # AUFS slowness.
 VOLUME /builds/worker/checkouts
 
+RUN echo "deb http://cdn.debian.net/debian bullseye-backports main" > /etc/apt/sources.list.d/bullseye-backports
+
 RUN apt-get update && \
     apt-get install --no-install-recommends -y \
         binutils build-essential cpio curl elfutils jq libxml2-utils \
         python3-pip rpm2cpio squashfs-tools unzip wget zip && \
+    apt-get install --no-install-recommends -y flatpak -t bullseye-backports && \
     apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
 
 COPY run.sh /builds/worker/run.sh
diff --git a/taskcluster/docker/system-symbols-linux-scraper/SHA256SUMS.txt b/taskcluster/docker/system-symbols-linux-scraper/SHA256SUMS.txt
index 46a456d21a37..c5a1f60349bb 100644
--- a/taskcluster/docker/system-symbols-linux-scraper/SHA256SUMS.txt
+++ b/taskcluster/docker/system-symbols-linux-scraper/SHA256SUMS.txt
@@ -1,6 +1,7 @@
 b4ba66e218aa6f27e19bfbc48142f86f3fddb64b6540fd5beb30bad11f73a409  arch/SHA256SUMS.zip
 6083ab8cb46a5be2a4d9bc51dce1443375f71d9536c325da39a14ba68c1de81a  debian/SHA256SUMS.zip
 64003a50133900e5d01b29e37022b3029652788a0e094b67330e5e32f1bf5e12  fedora/SHA256SUMS.zip
+314df333a939ca32bb03ae15a8b3f533513c1af6230908643228aff461e39ecf  firefox-flatpak/SHA256SUMS.zip
 00e3e54788b2d7867535eb25bc9ce41541dc6299dca0a8ce8d0d4e5b49839ac3  mint/SHA256SUMS.zip
 c4d02cc24f2a50b0caea20dd5fd0cd6bc960d0a619e8a355f7fec14a766e7966  opensuse/SHA256SUMS.zip
 aed77c596f5652f4ecdc48b37aaa1c2b0b516c7e74ccc0cf183e7d7de101b6d7  ubuntu/SHA256SUMS.zip
diff --git a/taskcluster/docker/system-symbols-linux-scraper/run.sh b/taskcluster/docker/system-symbols-linux-scraper/run.sh
index d7837d112e6a..56ee0dc1ef85 100755
--- a/taskcluster/docker/system-symbols-linux-scraper/run.sh
+++ b/taskcluster/docker/system-symbols-linux-scraper/run.sh
@@ -72,7 +72,7 @@ pushd "${MOZ_FETCHES_DIR}/symbol-scrapers/${DISTRO}"
   download_verify_extract_sha256sums "${sha256}"
   DUMP_SYMS=${MOZ_FETCHES_DIR}/dump_syms/dump_syms /bin/bash script.sh
   zip -r9 /builds/worker/artifacts/${SHA256SUMS} SHA256SUMS
-  cp wget*.log /builds/worker/artifacts/
+  cp wget*.log /builds/worker/artifacts/ || true
 popd
 
 if [ ! -f "/builds/worker/artifacts/target.crashreporter-symbols.zip" ]; then