diff --git a/build/50-install-bazaar.sh b/build/50-install-bazaar.sh
deleted file mode 100644
index 0dbe552..0000000
--- a/build/50-install-bazaar.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p /usr/share/flatpak/remotes.d/ && \
-    curl -o /usr/share/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
-
-mkdir -p /usr/share/flatpak/preinstall.d/ && \
-    echo -e "[io.github.kolunmi.Bazaar]\nPreinstall=true" > /usr/share/flatpak/preinstall.d/io.github.kolunmi.Bazaar.preinstall
diff --git a/build/50-prepare-flatpak-for-bazaar.sh b/build/50-prepare-flatpak-for-bazaar.sh
new file mode 100644
index 0000000..23112ff
--- /dev/null
+++ b/build/50-prepare-flatpak-for-bazaar.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -oue pipefail
+
+echo "Downloading Flathub repository definition..."
+mkdir -p /usr/share/flatpak/remotes.d/
+curl -o /usr/share/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo