diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
index 41610fa..427ffba 100644
--- a/.github/workflows/daily.yml
+++ b/.github/workflows/daily.yml
@@ -22,10 +22,12 @@ jobs:
           - name: x86
             runs-on: ubuntu-22.04
             architecture: x86_64
+            flat-manager-suffix: amd64
 
           - name: ARM
             runs-on: ubuntu-22.04-arm
             architecture: aarch64
+            flat-manager-suffix: arm64
 
     steps:
       - name: Checkout
@@ -40,7 +42,7 @@ jobs:
           sudo apt install -y ccache flatpak flatpak-builder gir1.2-ostree-1.0 meson python3-aiohttp python3-gi python3-tenacity xvfb zstd
           sudo rm -rf /var/lib/{apt,dpkg,cache,log}/
 
-          curl https://raw.githubusercontent.com/flatpak/flat-manager/0.3.7/flat-manager-client > ./flat-manager-client
+          curl https://github.com/flatpak/flat-manager/releases/download/0.5.0/flat-manager-client.${{ matrix.configuration.flat-manager-suffix }} > ./flat-manager-client
           sudo mv ./flat-manager-client /usr/bin/flat-manager-client
           sudo chown root: /usr/bin/flat-manager-client
           sudo chmod +x /usr/bin/flat-manager-client
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d683668..8e72a1f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,17 +23,19 @@ jobs:
           - name: x86
             runs-on: ubuntu-22.04
             architecture: x86_64
+            flat-manager-suffix: amd64
 
           - name: ARM
             runs-on: ubuntu-22.04-arm
             architecture: aarch64
+            flat-manager-suffix: arm64
 
     if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
 
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-        
+
       - name: Clean
         uses: ./.github/actions/maximize-build-space
 
@@ -43,7 +45,7 @@ jobs:
           sudo apt install -y ccache flatpak flatpak-builder gir1.2-ostree-1.0 meson python3-aiohttp python3-gi python3-tenacity xvfb zstd
           sudo rm -rf /var/lib/{apt,dpkg,cache,log}/
 
-          curl https://raw.githubusercontent.com/flatpak/flat-manager/0.3.7/flat-manager-client > ./flat-manager-client
+          curl https://github.com/flatpak/flat-manager/releases/download/0.5.0/flat-manager-client.${{ matrix.configuration.flat-manager-suffix }} > ./flat-manager-client
           sudo mv ./flat-manager-client /usr/bin/flat-manager-client
           sudo chown root: /usr/bin/flat-manager-client
           sudo chmod +x /usr/bin/flat-manager-client
diff --git a/Dockerfile b/Dockerfile
index 22a1389..77e373d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM ubuntu:latest
 
+ARG TARGETARCH
+
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
@@ -10,5 +12,5 @@ RUN apt-get update && \
 
 RUN flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo
 
-ADD https://raw.githubusercontent.com/flatpak/flat-manager/master/flat-manager-client /usr/bin
+ADD https://github.com/flatpak/flat-manager/releases/download/0.5.0/flat-manager-client.$TARGETARCH /usr/bin/flat-manager-client
 RUN chmod +x /usr/bin/flat-manager-client