diff --git a/files/bootc-update/bootc-fetch-apply-updates.service b/files/bootc-update/bootc-fetch-apply-updates.service
new file mode 100644
index 0000000..5a6c484
--- /dev/null
+++ b/files/bootc-update/bootc-fetch-apply-updates.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Apply bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Service]
+Type=oneshot
+# ExecStart=/usr/bin/bootc update --apply --quiet
+ExecStart=/usr/bin/bootc update --quiet
diff --git a/files/bootc-update/bootc-fetch-apply-updates.timer b/files/bootc-update/bootc-fetch-apply-updates.timer
new file mode 100644
index 0000000..4ebb663
--- /dev/null
+++ b/files/bootc-update/bootc-fetch-apply-updates.timer
@@ -0,0 +1,14 @@
+[Unit]
+Description=Apply bootc updates
+Documentation=man:bootc(8)
+ConditionPathExists=/run/ostree-booted
+
+[Timer]
+OnBootSec=1h
+# This time is relatively arbitrary and obviously expected to be overridden/changed
+OnUnitInactiveSec=8h
+# When deploying a large number of systems, it may be beneficial to increase this value to help with load on the registry.
+RandomizedDelaySec=2h
+
+[Install]
+WantedBy=timers.target
diff --git a/recipes/common/jp-common-bootc.yml b/recipes/common/jp-common-bootc.yml
index ab1dfd7..fa01e4f 100644
--- a/recipes/common/jp-common-bootc.yml
+++ b/recipes/common/jp-common-bootc.yml
@@ -7,7 +7,7 @@ modules:
   - from-file: common/gaming-bootc.yml
   - from-file: common/dev-packages-bootc.yml
   - from-file: common/dev-apps-bootc.yml
-  # - from-file: common/updates.yml
+  - from-file: common/updates.yml
   - type: files
     files:
       - source: distrobox
diff --git a/recipes/common/updates.yml b/recipes/common/updates.yml
index 1d9b445..95dc6d7 100644
--- a/recipes/common/updates.yml
+++ b/recipes/common/updates.yml
@@ -3,10 +3,12 @@ modules:
     files:
       - source: rpm-ostreed-conf
         destination: /etc
+      - source: bootc-update
+        destination: /usr/lib/systemd/system
   - type: systemd
     system:
       masked:
         - ublue-update.timer
-      enabled:
         - rpm-ostreed-automatic.timer
-        # - bootc-fetch-apply-updates.timer
+      enabled:
+        - bootc-fetch-apply-updates.timer
diff --git a/recipes/cp-laptop.yml b/recipes/cp-laptop.yml
index 8900bff..a252711 100644
--- a/recipes/cp-laptop.yml
+++ b/recipes/cp-laptop.yml
@@ -17,5 +17,6 @@ modules:
       - rstudio-desktop
       - libreoffice
   - from-file: common/ms-fonts.yml
+  - from-file: common/updates.yml
   - from-file: common/bluebuild-logo.yml
   - from-file: common/post-build.yml