diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
index 12bcde73..3ec33d86 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-user-setup
+++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -43,9 +43,9 @@ fi
 
 # Setup Flathub
 if grep -qz 'fedora' <<< $(flatpak remotes); then
-  flatpak remote-delete fedora --force
+  flatpak remote-delete --user fedora --force
 fi
-flatpak remote-add --if-not-exists --user flathub https://flathub.org/repo/flathub.flatpakrepo
+flatpak remote-add --if-not-exists --user flathub /etc/flatpak/remotes.d/flathub.flatpakrepo
 
 # Prevent future executions
 echo "Writing state file"
diff --git a/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install b/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
index c8eaa437..f27b053a 100755
--- a/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
+++ b/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
@@ -4,6 +4,7 @@ source /etc/default/bazzite
 if grep -qz 'fedora' <<< $(flatpak remotes); then
   /usr/lib/fedora-third-party/fedora-third-party-opt-out
   /usr/bin/fedora-third-party disable
+  flatpak remote-delete fedora --force
 fi
 
 if [[ -f '/etc/flatpak/install' ]]; then