diff --git a/tier-1/autoupdates.yaml b/tier-1/autoupdates.yaml
deleted file mode 100644
index a416699..0000000
--- a/tier-1/autoupdates.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-# Enable automatic updates by default
-postprocess:
-  - |
-    #!/usr/bin/env bash
-    set -euo pipefail
-    target=/usr/lib/systemd/system/default.target.wants
-    mkdir -p $target
-    set -x
-    ln -s ../bootc-fetch-apply-updates.timer $target
diff --git a/tier-1/generic-growfs.yaml b/tier-1/generic-growfs.yaml
deleted file mode 100644
index f64be92..0000000
--- a/tier-1/generic-growfs.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-add-files:
-  - - bootc-generic-growpart
-    - /usr/libexec/bootc-generic-growpart
-  - - bootc-generic-growpart.service
-    - /usr/lib/systemd/system/bootc-generic-growpart.service
-
-postprocess:
-  - |
-    #!/bin/bash
-    set -euo pipefail
-    mkdir -p /usr/lib/systemd/system/local-fs.target.wants
-    ln -s ../bootc-generic-growpart.service /usr/lib/systemd/system/local-fs.target.wants/bootc-generic-growpart.service
diff --git a/tier-1/manifest.yaml b/tier-1/manifest.yaml
index 826e11b..be1857b 100644
--- a/tier-1/manifest.yaml
+++ b/tier-1/manifest.yaml
@@ -3,12 +3,9 @@ recommends: true
 
 include:
   - ../tier-x/manifest.yaml
-  - autoupdates.yaml
   - networking-tools.yaml
   - system-configuration.yaml
   - coreos-user-experience.yaml
-  - persistent-journal.yaml
-  - generic-growfs.yaml
 
 packages:
   # Include and set the default editor
diff --git a/tier-1/usr/lib/systemd/system-preset/05-bootc.preset b/tier-1/usr/lib/systemd/system-preset/05-bootc.preset
new file mode 100644
index 0000000..e6e9067
--- /dev/null
+++ b/tier-1/usr/lib/systemd/system-preset/05-bootc.preset
@@ -0,0 +1,7 @@
+# Our fallback
+enable bootc-generic-growpart.service
+
+# We enable this by default just so we can say we have automatic
+# updates on by default, like CoreOS. It's very much intended
+# to be tweaked or replaced outside of trivial scenarios though.
+enable bootc-fetch-apply-updates.timer
diff --git a/tier-1/bootc-generic-growpart.service b/tier-1/usr/lib/systemd/system/bootc-generic-growpart.service
similarity index 100%
rename from tier-1/bootc-generic-growpart.service
rename to tier-1/usr/lib/systemd/system/bootc-generic-growpart.service
diff --git a/tier-1/bootc-generic-growpart b/tier-1/usr/libexec/bootc-generic-growpart
similarity index 100%
rename from tier-1/bootc-generic-growpart
rename to tier-1/usr/libexec/bootc-generic-growpart