diff --git a/scripts/build-flatpak.sh b/scripts/build-flatpak.sh
index dde16c0..6c7aa9a 100755
--- a/scripts/build-flatpak.sh
+++ b/scripts/build-flatpak.sh
@@ -5,18 +5,42 @@ root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "$root"
 
 gpg_key_id="${BEARWAVE_FLATPAK_GPG_KEY:-AA1D2F0170800855}"
+mode="build"
+deploy=false
+
+for arg in "$@"; do
+  case "${arg}" in
+    --reexport) mode="reexport" ;;
+    --deploy) deploy=true ;;
+    --reexport-deploy)
+      mode="reexport"
+      deploy=true
+      ;;
+  esac
+done
+
+if [[ "${mode}" == "reexport" ]]; then
+  flatpak-builder \
+    --repo=flatpak_repo \
+    --gpg-sign="${gpg_key_id}" \
+    --export-only \
+    flatpak_build \
+    de.nerdbear.bearwave.json
+else
+  flatpak-builder \
+    --repo=flatpak_repo \
+    --gpg-sign="${gpg_key_id}" \
+    --force-clean \
+    flatpak_build \
+    de.nerdbear.bearwave.json
+fi
 
-flatpak-builder \
-  --repo=flatpak_repo \
-  --gpg-sign="${gpg_key_id}" \
-  --force-clean \
-  flatpak_build \
-  de.nerdbear.bearwave.json
 flatpak build-update-repo --gpg-sign="${gpg_key_id}" flatpak_repo
 
 echo "Flatpak repo updated in flatpak_repo/."
-echo "Deploy with: scripts/deploy-flatpak.sh"
 
-if [[ "${1:-}" == "--deploy" ]]; then
+if [[ "${deploy}" == true ]]; then
   exec "${root}/scripts/deploy-flatpak.sh"
-fi
\ No newline at end of file
+fi
+
+echo "Deploy with: scripts/deploy-flatpak.sh"
\ No newline at end of file