diff --git a/files/systemd/system/bootc-fetch-updates.service b/files/systemd/system/bootc-fetch-updates.service
new file mode 100644
index 0000000..c316cde
--- /dev/null
+++ b/files/systemd/system/bootc-fetch-updates.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Download bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/bootc update --quiet
\ No newline at end of file
diff --git a/files/systemd/system/bootc-fetch-updates.timer b/files/systemd/system/bootc-fetch-updates.timer
new file mode 100644
index 0000000..482831f
--- /dev/null
+++ b/files/systemd/system/bootc-fetch-updates.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Download bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Timer]
+OnBootSec=15min
+OnUnitInactiveSec=8h
+RandomizedDelaySec=2h
+
+[Install]
+WantedBy=timers.target
\ No newline at end of file
diff --git a/recipes/components/base-module.yml b/recipes/components/base-module.yml
index 558cf28..63c3d42 100644
--- a/recipes/components/base-module.yml
+++ b/recipes/components/base-module.yml
@@ -11,7 +11,7 @@ modules:
   - type: systemd
     system:
       enabled:
-        - bootc-fetch-apply-updates.timer
+        - bootc-fetch-updates.timer
         - podman-auto-update.timer
         - flatpak-system-update.timer
         - notify-update.service
@@ -19,6 +19,7 @@ modules:
       enabled:
         - podman-auto-update.timer
         - flatpak-user-update.timer
+        - unlock-wallet.service
   
   - type: dnf
     install: