diff --git a/build.sh b/build.sh
index c1afa65..4bf24d9 100755
--- a/build.sh
+++ b/build.sh
@@ -56,10 +56,10 @@ dnf config-manager --set-enabled baseos-compose,appstream-compose
 
 # Additions
 dnf -y install \
+    -x gnome-extensions-app \
     distrobox \
     gnome-shell-extension-appindicator \
     gnome-shell-extension-dash-to-dock \
-    gnome-tweaks \
     tuned-ppd \
     fpaste \
     distribution-gpg-keys \
diff --git a/system_files/etc/ublue-os/system-flatpaks.list b/system_files/etc/ublue-os/system-flatpaks.list
new file mode 100644
index 0000000..0b2e466
--- /dev/null
+++ b/system_files/etc/ublue-os/system-flatpaks.list
@@ -0,0 +1,31 @@
+io.github.dvlv.boxbuddyrs
+com.github.rafostar.Clapper
+io.gitlab.adhami3310.Impression
+com.github.tchx84.Flatseal
+io.github.flattool.Ignition
+io.github.flattool.Warehouse
+org.gnome.baobab
+org.gnome.Calculator
+org.gnome.Calendar
+org.gnome.Characters
+org.gnome.clocks
+org.gnome.Connections
+org.gnome.Contacts
+org.gnome.DejaDup
+org.gnome.Papers
+com.mattjakeman.ExtensionManager
+org.gnome.FileRoller
+org.gnome.font-viewer
+org.gnome.Logs
+org.gnome.Loupe
+org.gnome.Maps
+org.gnome.NautilusPreviewer
+org.gnome.World.PikaBackup
+org.gnome.TextEditor
+org.gnome.Weather
+io.missioncenter.MissionCenter
+org.mozilla.firefox
+org.mozilla.Thunderbird
+page.tesk.Refine
+runtime/org.gtk.Gtk3theme.adw-gtk3
+runtime/org.gtk.Gtk3theme.adw-gtk3-dark
diff --git a/system_files/usr/share/ublue-os/just/60-custom.just b/system_files/usr/share/ublue-os/just/60-custom.just
index 6fb3bcd..82dfc10 100644
--- a/system_files/usr/share/ublue-os/just/60-custom.just
+++ b/system_files/usr/share/ublue-os/just/60-custom.just
@@ -1,9 +1,6 @@
 install-system-flatpaks:
     #!/usr/bin/env bash
-    if ! flatpak remotes | grep -q flathub; then
-        flatpak remote-add --system flathub https://flathub.org/repo/flathub.flatpakrepo
-    fi
-    flatpak --system -y install --or-update $(curl -s https://raw.githubusercontent.com/ublue-os/bluefin/main/bluefin_flatpaks/flatpaks | tr '\n' ' ')
+    xargs flatpak --system -y install --or-update < /etc/ublue-os/system-flatpaks.list
 
 bluefin-cli:
     /usr/libexec/ublue-bling