diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a416fefd..234372518 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build
-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v5
         with:
           bundle: calendar.flatpak
           manifest-path: io.elementary.calendar.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 24e978b96..21557e2e3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -42,7 +42,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build
-        uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master
+        uses: flatpak/flatpak-github-actions/flatpak-builder@v5
         with:
           bundle: calendar.flatpak
           manifest-path: io.elementary.calendar.yml
@@ -53,7 +53,7 @@ jobs:
           branch: stable
 
       - name: Deploy
-        uses: bilelmoussaoui/flatpak-github-actions/flat-manager@v5
+        uses: flatpak/flatpak-github-actions/flat-manager@v5
         with:
           repository: appcenter
           flat-manager-url: https://flatpak-api.elementary.io