diff --git a/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset b/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset
index faa9b52..593c775 100644
--- a/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset
+++ b/mkosi.extra/usr/lib/systemd/system-preset/10-apollo-base.preset
@@ -4,8 +4,9 @@ enable apparmor.service
 enable bluetooth.service
 enable cups.service
 enable firewalld.service
+enable flatpak-preinstall.service
 enable fwupd.service
 enable gdm.service
 enable gnome-initial-setup.service
 enable NetworkManager.service
-enable systemd-resolved.service
+enable systemd-resolved.service
\ No newline at end of file
diff --git a/mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service b/mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service
new file mode 100644
index 0000000..cdf5a6d
--- /dev/null
+++ b/mkosi.extra/usr/lib/systemd/system/flatpak-preinstall.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Preinstall Flatpaks
+After=network-online.target
+Wants=network-online.target
+ConditionPathExists=/usr/bin/flatpak
+ConditionPathExists=!/var/lib/apollo/preinstall-finished
+Documentation=man:flatpak-preinstall(1)
+
+[Service]
+Type=oneshot
+ExecStart=mkdir -p /var/lib/apollo
+ExecStart=/usr/bin/flatpak preinstall -y
+ExecStart=touch /var/lib/apollo/preinstall-finished
+RemainAfterExit=true
+Restart=on-failure
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall b/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall
new file mode 100644
index 0000000..14e4f60
--- /dev/null
+++ b/mkosi.extra/usr/share/flatpak/preinstall.d/flathub.preinstall
@@ -0,0 +1,88 @@
+[Flatpak Preinstall org.gnome.Epiphany]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.TextEditor]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall io.github.kolunmi.Bazaar]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Firmware]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall com.mattjakeman.ExtensionManager]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.FileRoller]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Loupe]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Papers]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall page.tesk.Refine]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall net.nokyan.Resources]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Calendar]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Contacts]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.baobab]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Showtime]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Snapshot]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Decibels]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Music]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.SimpleScan]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Logs]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.clocks]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.font-viewer]
+Branch=stable
+IsRuntime=false
+
+[Flatpak Preinstall org.gnome.Calculator]
+Branch=stable
+IsRuntime=false
+