diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index f0bf5af9ea..f9a99711ae 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -38,6 +38,10 @@ conditional-include:
     include: podman-v5.yaml
   - if: releasever >= 40
     include: cliwrap.yaml
+  - if: podman-machine-os == false
+    include:
+      - podman.yaml
+      - moby-engine.yaml
 
 ostree-layers:
   - overlay/15fcos
@@ -55,10 +59,6 @@ packages:
   # the archive repo for more reliable package layering
   # https://github.com/coreos/fedora-coreos-tracker/issues/400
   - fedora-repos-archive
-  # CL ships this.
-  - moby-engine
-  # Already pulled in by moby-engine, but let's be explicit. Typhoon uses it.
-  - containerd
   # Updates
   - zincati
   # Include and set the default editor
diff --git a/manifests/moby-engine.yaml b/manifests/moby-engine.yaml
new file mode 100644
index 0000000000..f33b8c2c15
--- /dev/null
+++ b/manifests/moby-engine.yaml
@@ -0,0 +1,6 @@
+packages:
+  # CL shipped this
+  - moby-engine
+  # Already pulled in by moby-engine, but let's be explicit. Typhoon uses it.
+  - containerd
+  - runc
diff --git a/manifests/podman.yaml b/manifests/podman.yaml
new file mode 100644
index 0000000000..9a564205c6
--- /dev/null
+++ b/manifests/podman.yaml
@@ -0,0 +1,3 @@
+packages:
+  - podman
+  - crun
diff --git a/manifests/user-experience.yaml b/manifests/user-experience.yaml
index ee848357cf..b81c623b79 100644
--- a/manifests/user-experience.yaml
+++ b/manifests/user-experience.yaml
@@ -37,13 +37,11 @@ packages:
   # Remote Access
   - openssh-clients openssh-server
   # Container tooling
-  ## crun recommends but doesn't require criu and criu-libs. We want them for
-  ## checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
-  - crun criu criu-libs
-  - podman
-  - runc
   - skopeo
   - toolbox
+  # crun recommends but doesn't require criu and criu-libs. We want them for
+  # checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
+  - criu criu-libs
   # passt provides user-mode networking daemons for namespaces
   - passt
   # nvme-cli for managing nvme disks