diff --git a/common.yaml b/common.yaml
index df274ecc9..5b6be0b3d 100644
--- a/common.yaml
+++ b/common.yaml
@@ -6,7 +6,7 @@ include:
   - fedora-coreos-config/manifests/file-transfer.yaml
   - fedora-coreos-config/manifests/networking-tools.yaml
   - fedora-coreos-config/manifests/user-experience.yaml
-  - fedora-coreos-config/manifests/shared-workarounds.yaml
+  - fedora-coreos-config/manifests/tier-x.yaml
   # RHCOS owned packages
   - packages-rhcos.yaml
 
@@ -25,12 +25,8 @@ ostree-layers:
   - overlay/30rhcos-nvme-compat-udev
   - overlay/30gcp-udev-rules
   - overlay/30lvmdevices
-  - overlay/40grub
 
 conditional-include:
-  - if: basearch != "s390x"
-    # And remove some cruft from grub2
-    include: fedora-coreos-config/manifests/grub2-removals.yaml
   # Packages specific to el9
   - if: osversion == "centos-9"
     include:
@@ -43,10 +39,6 @@ conditional-include:
   - if: osversion == "centos-10"
     include:
       - fedora-coreos-config/manifests/shared-el10.yaml
-  - if: inherit_tier_x == true
-    include: fedora-coreos-config/manifests/tier-x.yaml
-  - if: inherit_tier_x == false
-    include: fedora-coreos-config/manifests/tier-x-dupes.yaml
 
 documentation: false
 
diff --git a/extensions/Dockerfile b/extensions/Dockerfile
index a6dd91655..11d680bd4 100644
--- a/extensions/Dockerfile
+++ b/extensions/Dockerfile
@@ -10,15 +10,10 @@ ARG OPENSHIFT_CI=0
 RUN --mount=type=secret,id=yumrepos,target=/os/secret.repo extensions/build.sh
 
 ## Creates the repo metadata for the extensions.
-## This uses Fedora as a lowest-common-denominator because it will work on
-## current p8/s390x. See https://github.com/openshift/os/issues/1000
-FROM quay.io/fedora/fedora:41 as builder
+FROM quay.io/centos/centos:stream9 as builder
 COPY --from=os /usr/share/rpm-ostree/extensions/ /usr/share/rpm-ostree/extensions/
-RUN rm -f /etc/yum.repos.d/*.repo \
-&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-archive.repo -o /etc/yum.repos.d/fedora-archive.repo
 RUN dnf install -y createrepo_c
 RUN createrepo_c /usr/share/rpm-ostree/extensions/
-
 # Generate extensions.json for meta.json.
 # Use dnf repoquery to print 'name: version,' for each RPM
 # sed to remove the comma from the last RPM
diff --git a/fast-tracks.yaml b/fast-tracks.yaml
new file mode 100644
index 000000000..bd794f9fe
--- /dev/null
+++ b/fast-tracks.yaml
@@ -0,0 +1,13 @@
+c9s-appstream-back-tracks:
+  from: c9s-appstream
+  packages:
+    # While we wait we can pull this from c9s
+    # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969
+    - ignition*
+rhel-9.6-server-ose-4.19-back-tracks:
+  from: rhel-9.6-server-ose-4.19
+  packages:
+    # While we wait we can pull this from rhel-9.6 openshift rhaos repos
+    # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969
+    # which will then flow into RHEL 10.1.
+    - ignition*
diff --git a/fedora-coreos-config b/fedora-coreos-config
index 3ac1147b7..3073b9dec 160000
--- a/fedora-coreos-config
+++ b/fedora-coreos-config
@@ -1 +1 @@
-Subproject commit 3ac1147b7e302b22229cf5f04e86d007a0386907
+Subproject commit 3073b9dec4c020cb2db0df09636904925e4b04bc
diff --git a/kola-denylist.yaml b/kola-denylist.yaml
index 024c09bbb..bebd1fd92 100644
--- a/kola-denylist.yaml
+++ b/kola-denylist.yaml
@@ -84,27 +84,6 @@
     - centos-10
     - rhel-10.1
 
-# Waiting for submodule bump
-- pattern: ext.config.shared.networking.nm-ifcfg-rh-plugin
-  tracker: https://github.com/openshift/os/pull/1759#issuecomment-2779700581
-  osversion:
-    - centos-10
-    - rhel-10.1
-
-# Waiting for submodule bump
-- pattern: ext.config.shared.networking.team-dhcp-via-ignition
-  tracker: https://github.com/openshift/os/pull/1759#issuecomment-2779700581
-  osversion:
-    - centos-10
-    - rhel-10.1
-
-# Waiting for submodule bump
-# https://github.com/coreos/fedora-coreos-config/pull/3439
-- pattern: ext.config.shared.networking.default-network-behavior-change
-  tracker: https://github.com/openshift/os/pull/1759#issuecomment-2779700581
-  osversion:
-    - rhel-10.1
-
 - pattern: ext.config.shared.content-origins
   tracker: https://issues.redhat.com/browse/RHEL-86436
   osversion:
@@ -118,10 +97,5 @@
     - centos-10
     - rhel-10.1
 
-# We are currently adding a dead symlink to allow MCO to install a pacemaker
-# resource agent in Two Node OpenShift with Fencing (TNF). This will be removed
-# once the underlying agent is shipped as part of the `two-node-ha` extension
-# and the TNF controller in etcd is updated to initialize pacemaker clusters
-# via the version shipped in the extension.
-- pattern: ext.config.shared.files.validate-symlinks
-  tracker: https://issues.redhat.com/browse/OCPEDGE-1706
+- pattern: ext.config.shared.multipath.resilient
+  tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1937
diff --git a/manifest-c10s.yaml b/manifest-c10s.yaml
index b668877ae..808938b81 100644
--- a/manifest-c10s.yaml
+++ b/manifest-c10s.yaml
@@ -8,7 +8,6 @@ metadata:
 variables:
   id: "centos"
   osversion: "centos-10"
-  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:
@@ -19,6 +18,9 @@ repos:
   - c10s-baseos
   - c10s-appstream
   - c10s-extras-common
+  # While we wait we can pull this from c9s
+  # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969
+  - c9s-appstream-back-tracks
 
 automatic-version-prefix: "10.0.<date:%Y%m%d>"
 # This ensures we're semver-compatible which OpenShift wants
diff --git a/manifest-c9s.yaml b/manifest-c9s.yaml
index ea34983e8..3133109c1 100644
--- a/manifest-c9s.yaml
+++ b/manifest-c9s.yaml
@@ -8,7 +8,6 @@ metadata:
 variables:
   id: "centos"
   osversion: "centos-9"
-  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:
diff --git a/manifest-rhel-10.1.yaml b/manifest-rhel-10.1.yaml
index a1d8b1723..071502f66 100644
--- a/manifest-rhel-10.1.yaml
+++ b/manifest-rhel-10.1.yaml
@@ -8,7 +8,6 @@ metadata:
 variables:
   id: "rhel"
   osversion: "rhel-10.1"
-  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:
@@ -21,6 +20,10 @@ repos:
   - rhel-10.1-appstream
   # Early kernel repo not available for now
   # - rhel-10.1-early-kernel
+  # While we wait we can pull this from rhel-9.6
+  # https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos/-/merge_requests/969
+  # which will then flow into RHEL 10.1.
+  - rhel-9.6-server-ose-4.19-back-tracks
 
 automatic-version-prefix: "10.1.<date:%Y%m%d>"
 # This ensures we're semver-compatible which OpenShift wants
diff --git a/manifest-rhel-9.6.yaml b/manifest-rhel-9.6.yaml
index 70189d09e..f0c086d2e 100644
--- a/manifest-rhel-9.6.yaml
+++ b/manifest-rhel-9.6.yaml
@@ -8,7 +8,6 @@ metadata:
 variables:
   id: "rhel"
   osversion: "rhel-9.6"
-  inherit_tier_x: true
 
 # Include manifests common to all RHEL and CentOS Stream versions
 include:
diff --git a/overlay.d/07fix-selinux-labels b/overlay.d/07fix-selinux-labels
deleted file mode 120000
index c7b8cd468..000000000
--- a/overlay.d/07fix-selinux-labels
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-coreos-config/overlay.d/07fix-selinux-labels
\ No newline at end of file
diff --git a/overlay.d/40grub b/overlay.d/40grub
deleted file mode 120000
index e2b280393..000000000
--- a/overlay.d/40grub
+++ /dev/null
@@ -1 +0,0 @@
-../fedora-coreos-config/overlay.d/40grub
\ No newline at end of file