diff --git a/flatpak/.config/systemd/user/flatpak-automatic.service b/flatpak/.config/systemd/user/flatpak-automatic.service
index 586039e..6d56554 100644
--- a/flatpak/.config/systemd/user/flatpak-automatic.service
+++ b/flatpak/.config/systemd/user/flatpak-automatic.service
@@ -3,6 +3,7 @@ Description=flatpak Automatic Update
 Documentation=man:flatpak(1)
 
 [Service]
-Type=simple
+Type=oneshot
 ExecStartPre=nm-online
 ExecStart=/usr/bin/flatpak update -y
+ExecStart=/usr/bin/flatpak remove --unused -y
diff --git a/flatpak/.config/systemd/user/flatpak-automatic.timer b/flatpak/.config/systemd/user/flatpak-automatic.timer
index df55ed3..423e87d 100644
--- a/flatpak/.config/systemd/user/flatpak-automatic.timer
+++ b/flatpak/.config/systemd/user/flatpak-automatic.timer
@@ -1,6 +1,8 @@
 [Unit]
 Description=flatpak Automatic Update Trigger
 Documentation=man:flatpak(1)
+After=time-set.target
+After=time-sync.target
 
 [Timer]
 OnBootSec=1m