diff --git a/fedora.yaml b/fedora.yaml
index 53eea7a..48d86b1 100644
--- a/fedora.yaml
+++ b/fedora.yaml
@@ -13,11 +13,6 @@ include:
   - oscore/kernel.yaml
 
 packages:
-  # We include this for historical reasons
-  - fedora-repos-ostree
-  # fedora-repos-modular was converted into its own subpackage in f33
-  # Continue to include it in case users want to use it.
-  - fedora-repos-modular
   # file-transfer: note fuse-sshfs is not in RHEL
   # so we can't put it in file-transfer.yaml
   # Storage
diff --git a/oscore/manifest.yaml b/oscore/manifest.yaml
index aec2426..52056c6 100644
--- a/oscore/manifest.yaml
+++ b/oscore/manifest.yaml
@@ -51,8 +51,6 @@ mutate-os-release: "${releasever}"
 packages:
   # Include and set the default editor
   - nano
-  # TODO: Also consider dropping this
-  - systemd-container
   - fuse-overlayfs slirp4netns
   # support for old style CNI networks and name resolution for
   # podman containers with CNI networks
diff --git a/oscore/system-configuration.yaml b/oscore/system-configuration.yaml
index 69dd366..ae8ab58 100644
--- a/oscore/system-configuration.yaml
+++ b/oscore/system-configuration.yaml
@@ -37,14 +37,3 @@ packages:
   # https://github.com/coreos/fedora-coreos-tracker/issues/753
   - stalld
   - ssh-key-dir
-
-postprocess:
-  # Make kdump work on firstboot
-  - |
-    #!/usr/bin/env bash
-    # Make kdump ignore `ignition.firstboot` when copying kargs from
-    # the running kernel to the kdump kernel when passing to be kexec.
-    # This makes it so kdump can be set up on the very first boot.
-    # Upstream request to have this upstream so we can stop carrying it here:
-    # https://lists.fedoraproject.org/archives/list/kexec@lists.fedoraproject.org/thread/5P4WIJLW2TSGF4PZGRZGOXYML4RXZU23/
-    sed -i -e 's/KDUMP_COMMANDLINE_REMOVE="/KDUMP_COMMANDLINE_REMOVE="ignition.firstboot /' /etc/sysconfig/kdump