diff --git a/Containerfile b/Containerfile
index 264c65cf..8748698b 100644
--- a/Containerfile
+++ b/Containerfile
@@ -133,11 +133,6 @@ RUN rm /usr/share/applications/shredder.desktop && \
     sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
     mkdir -p /etc/flatpak/remotes.d && \
     wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /etc/flatpak/remotes.d && \
-    cat /etc/flatpak/install | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
-    cat /etc/flatpak/deck | while read line; do flatpak install --system --noninteractive --no-deploy flathub $line; done && \
-    mkdir -p /etc/flatpak/{flathub,objects} && \
-    cp -r /var/lib/flatpak/repo/refs/remotes/flathub/* /etc/flatpak/flathub && \
-    cp -r /var/lib/flatpak/repo/objects/* /etc/flatpak/objects && \
     systemctl unmask flatpak-system-install.service && \
     systemctl enable flatpak-system-install.service && \
     systemctl disable rpm-ostreed-automatic.timer && \
diff --git a/system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service b/system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service
index 7dd6b986..d6a1161d 100644
--- a/system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service
+++ b/system_files/desktop/shared/etc/systemd/system/flatpak-system-install.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=Install System Flatpak on boot
 Documentation=https://github.com/ublue-os/endlish-oesque/issues/10
+Wants=network-online.target
+After=network-online.target
 
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/ublue-flatpak-system-install
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target
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 e6d82ec4..a56aa9fe 100755
--- a/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
+++ b/system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
@@ -2,23 +2,22 @@
 source /etc/default/bazzite
 
 if [[ -f '/etc/flatpak/install' ]]; then
-  cp -r /etc/flatpak/flathub/* /var/lib/flatpak/repo/refs/remotes/flathub
-  cp -r /etc/flatpak/objects/* /var/lib/flatpak/repo/objects
   cat /etc/flatpak/install | while read line; do
-    flatpak install --system --noninteractive --no-pull flathub $line
+    flatpak install --system --noninteractive flathub $line
   done && mv /etc/flatpak/install /etc/flatpak/installed
 fi
 
 if [[ -f '/etc/flatpak/remove' ]]; then
   cat /etc/flatpak/remove | while read line; do
-    flatpak remove --system --noninteractive $line
-  done && mv /etc/flatpak/install /etc/flatpak/removed
+    flatpak remove --system --noninteractive $line 2>/dev/null
+  done
+  mv /etc/flatpak/remove /etc/flatpak/removed
 fi
 
 if [[ -f '/etc/flatpak/deck' ]]; then
   if [[ ${IMAGE_NAME} == *'deck'* ]]; then
     cat /etc/flatpak/deck | while read line; do
-      flatpak install --system --noninteractive --no-pull flathub $line
+      flatpak install --system --noninteractive flathub $line
     done && cat /etc/flatpak/deck >> /etc/flatpak/installed
   fi
 fi
diff --git a/system_files/desktop/silverblue/etc/flatpak/install b/system_files/desktop/silverblue/etc/flatpak/install
index dd1f8ac5..9cc717aa 100644
--- a/system_files/desktop/silverblue/etc/flatpak/install
+++ b/system_files/desktop/silverblue/etc/flatpak/install
@@ -2,9 +2,24 @@ net.davidotek.pupgui2
 org.freedesktop.Platform.VulkanLayer.MangoHud//22.08
 org.freedesktop.Platform.VulkanLayer.vkBasalt//22.08
 io.github.Foldex.AdwSteamGtk
-org.gnome.Loupe
 com.mattjakeman.ExtensionManager
 org.gtk.Gtk3theme.adw-gtk3
 org.gtk.Gtk3theme.adw-gtk3-dark
 org.mozilla.firefox
 com.github.tchx84.Flatseal
+org.gnome.Calculator
+org.gnome.Calendar
+org.gnome.Characters
+org.gnome.Connections
+org.gnome.Contacts
+org.gnome.Evince
+org.gnome.Extensions
+org.gnome.Logs
+org.gnome.Loupe
+org.gnome.Maps
+org.gnome.NautilusPreviewer
+org.gnome.TextEditor
+org.gnome.Weather
+org.gnome.baobab
+org.gnome.clocks
+org.gnome.font-viewer