diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 2d21e543d0..674eea3332 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -14,25 +14,3 @@ type=rpm
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False
-excludepkgs=kernel kernel-core kernel-modules kernel-modules-core
-
-# We are choosing to use only nodebug kernels in Fedora CoreOS
-# for our testing. We've seen too many issues where an issue either
-# shows up only on the debug kernels OR a debug kernel gives us a
-# false positive or negative when trying to root cause a failure.
-# Thus we use the nodebug kernel repo [1] and includepkgs=kernel
-# here and excludepkgs=kernel above.
-#
-# [1] https://fedoraproject.org/wiki/RawhideKernelNodebug
-[fedora-rawhide-nodebug-kernel]
-name=nodebug kernels for Rawhide
-baseurl=https://dl.fedoraproject.org/pub/alt/rawhide-kernel-nodebug/$basearch/
-enabled=1
-countme=1
-metadata_expire=6h
-repo_gpgcheck=0
-type=rpm
-gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-includepkgs=kernel kernel-core kernel-modules kernel-modules-core
diff --git a/kola-denylist.yaml b/kola-denylist.yaml
index 49222894a8..f6b960afa2 100644
--- a/kola-denylist.yaml
+++ b/kola-denylist.yaml
@@ -31,11 +31,6 @@
     - stable
 - pattern: ext.config.kdump.crash
   tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1430
-  # snooze: 2023-03-22 (disabled on promotion)
+  # snooze: 2023-04-12 (disabled on promotion)
   arches:
     - aarch64
-  streams:
-    - rawhide
-    - branched
-    - next-devel
-    - next
diff --git a/manifest-lock.aarch64.json b/manifest-lock.aarch64.json
index ce411ff02d..c1964c48da 100644
--- a/manifest-lock.aarch64.json
+++ b/manifest-lock.aarch64.json
@@ -28,13 +28,13 @@
       "evra": "0.9.1-11.fc37.aarch64"
     },
     "afterburn": {
-      "evra": "5.4.0-1.fc37.aarch64"
+      "evra": "5.4.0-2.fc37.aarch64"
     },
     "afterburn-dracut": {
-      "evra": "5.4.0-1.fc37.aarch64"
+      "evra": "5.4.0-2.fc37.aarch64"
     },
     "alternatives": {
-      "evra": "1.21-1.fc37.aarch64"
+      "evra": "1.22-1.fc37.aarch64"
     },
     "amd-gpu-firmware": {
       "evra": "20230310-148.fc37.noarch"
@@ -64,13 +64,13 @@
       "evra": "1:2.11-8.fc37.noarch"
     },
     "bind-libs": {
-      "evra": "32:9.18.12-1.fc37.aarch64"
+      "evra": "32:9.18.13-1.fc37.aarch64"
     },
     "bind-license": {
-      "evra": "32:9.18.12-1.fc37.noarch"
+      "evra": "32:9.18.13-1.fc37.noarch"
     },
     "bind-utils": {
-      "evra": "32:9.18.12-1.fc37.aarch64"
+      "evra": "32:9.18.13-1.fc37.aarch64"
     },
     "bootupd": {
       "evra": "0.2.8-3.fc37.aarch64"
@@ -79,7 +79,7 @@
       "evra": "3.6.1-3.fc37.aarch64"
     },
     "btrfs-progs": {
-      "evra": "6.2.1-1.fc37.aarch64"
+      "evra": "6.2.2-1.fc37.aarch64"
     },
     "bubblewrap": {
       "evra": "0.5.0-3.fc37.aarch64"
@@ -136,7 +136,7 @@
       "evra": "0.21.3-3.fc37.noarch"
     },
     "container-selinux": {
-      "evra": "2:2.204.0-1.fc37.noarch"
+      "evra": "2:2.206.0-1.fc37.noarch"
     },
     "containerd": {
       "evra": "1.6.19-1.fc37.aarch64"
@@ -175,7 +175,7 @@
       "evra": "3.17.1-3.fc37.aarch64"
     },
     "crun": {
-      "evra": "1.8.1-1.fc37.aarch64"
+      "evra": "1.8.3-2.fc37.aarch64"
     },
     "crypto-policies": {
       "evra": "20220815-1.gite4ed860.fc37.noarch"
@@ -187,7 +187,7 @@
       "evra": "2.6.1-1.fc37.aarch64"
     },
     "curl": {
-      "evra": "7.85.0-7.fc37.aarch64"
+      "evra": "7.85.0-8.fc37.aarch64"
     },
     "cyrus-sasl-gssapi": {
       "evra": "2.1.28-8.fc37.aarch64"
@@ -313,7 +313,7 @@
       "evra": "1:4.9.0-2.fc37.aarch64"
     },
     "flatpak-session-helper": {
-      "evra": "1.14.1-2.fc37.aarch64"
+      "evra": "1.14.4-1.fc37.aarch64"
     },
     "fstrm": {
       "evra": "0.6.1-5.fc37.aarch64"
@@ -394,16 +394,16 @@
       "evra": "3.7-4.fc37.aarch64"
     },
     "grub2-common": {
-      "evra": "1:2.06-88.fc37.noarch"
+      "evra": "1:2.06-89.fc37.noarch"
     },
     "grub2-efi-aa64": {
-      "evra": "1:2.06-88.fc37.aarch64"
+      "evra": "1:2.06-89.fc37.aarch64"
     },
     "grub2-tools": {
-      "evra": "1:2.06-88.fc37.aarch64"
+      "evra": "1:2.06-89.fc37.aarch64"
     },
     "grub2-tools-minimal": {
-      "evra": "1:2.06-88.fc37.aarch64"
+      "evra": "1:2.06-89.fc37.aarch64"
     },
     "gzip": {
       "evra": "1.12-2.fc37.aarch64"
@@ -487,13 +487,16 @@
       "evra": "2.5.1-3.fc37.noarch"
     },
     "kernel": {
-      "evra": "6.1.18-200.fc37.aarch64"
+      "evra": "6.2.8-200.fc37.aarch64"
     },
     "kernel-core": {
-      "evra": "6.1.18-200.fc37.aarch64"
+      "evra": "6.2.8-200.fc37.aarch64"
     },
     "kernel-modules": {
-      "evra": "6.1.18-200.fc37.aarch64"
+      "evra": "6.2.8-200.fc37.aarch64"
+    },
+    "kernel-modules-core": {
+      "evra": "6.2.8-200.fc37.aarch64"
     },
     "kexec-tools": {
       "evra": "2.0.25-1.fc37.aarch64"
@@ -565,7 +568,7 @@
       "evra": "1.46.5-3.fc37.aarch64"
     },
     "libcurl-minimal": {
-      "evra": "7.85.0-7.fc37.aarch64"
+      "evra": "7.85.0-8.fc37.aarch64"
     },
     "libdaemon": {
       "evra": "0.14-24.fc37.aarch64"
@@ -724,16 +727,16 @@
       "evra": "2.5.3-3.fc37.aarch64"
     },
     "libselinux": {
-      "evra": "3.4-5.fc37.aarch64"
+      "evra": "3.5-1.fc37.aarch64"
     },
     "libselinux-utils": {
-      "evra": "3.4-5.fc37.aarch64"
+      "evra": "3.5-1.fc37.aarch64"
     },
     "libsemanage": {
-      "evra": "3.4-5.fc37.aarch64"
+      "evra": "3.5-1.fc37.aarch64"
     },
     "libsepol": {
-      "evra": "3.4-3.fc37.aarch64"
+      "evra": "3.5-1.fc37.aarch64"
     },
     "libsigsegv": {
       "evra": "2.14-3.fc37.aarch64"
@@ -913,7 +916,7 @@
       "evra": "1:1.0.4-3.fc37.aarch64"
     },
     "nmstate": {
-      "evra": "2.2.8-2.fc37.aarch64"
+      "evra": "2.2.9-2.fc37.aarch64"
     },
     "npth": {
       "evra": "1.6-9.fc37.aarch64"
@@ -1003,7 +1006,7 @@
       "evra": "5:4.4.2-2.fc37.aarch64"
     },
     "policycoreutils": {
-      "evra": "3.4-6.fc37.aarch64"
+      "evra": "3.5-1.fc37.aarch64"
     },
     "polkit": {
       "evra": "121-4.fc37.aarch64"
@@ -1030,7 +1033,7 @@
       "evra": "20210518-5.fc37.noarch"
     },
     "qemu-user-static-x86": {
-      "evra": "2:7.0.0-14.fc37.aarch64"
+      "evra": "2:7.0.0-15.fc37.aarch64"
     },
     "readline": {
       "evra": "8.2-2.fc37.aarch64"
@@ -1087,10 +1090,10 @@
       "evra": "1.46-4.fc37.aarch64"
     },
     "shadow-utils": {
-      "evra": "2:4.12.3-4.fc37.aarch64"
+      "evra": "2:4.12.3-6.fc37.aarch64"
     },
     "shadow-utils-subid": {
-      "evra": "2:4.12.3-4.fc37.aarch64"
+      "evra": "2:4.12.3-6.fc37.aarch64"
     },
     "shared-mime-info": {
       "evra": "2.2-2.fc37.aarch64"
@@ -1177,7 +1180,7 @@
       "evra": "251.13-6.fc37.aarch64"
     },
     "tar": {
-      "evra": "2:1.34-5.fc37.aarch64"
+      "evra": "2:1.34-6.fc37.aarch64"
     },
     "teamd": {
       "evra": "1.31-6.fc37.aarch64"
@@ -1204,10 +1207,10 @@
       "evra": "2.38.1-1.fc37.aarch64"
     },
     "vim-data": {
-      "evra": "2:9.0.1407-1.fc37.noarch"
+      "evra": "2:9.0.1429-1.fc37.noarch"
     },
     "vim-minimal": {
-      "evra": "2:9.0.1407-1.fc37.aarch64"
+      "evra": "2:9.0.1429-1.fc37.aarch64"
     },
     "which": {
       "evra": "2.21-39.fc37.aarch64"
@@ -1216,7 +1219,7 @@
       "evra": "1.0.20210914-3.fc37.aarch64"
     },
     "xfsprogs": {
-      "evra": "5.18.0-3.fc37.aarch64"
+      "evra": "6.1.0-2.fc37.aarch64"
     },
     "xxhash-libs": {
       "evra": "0.8.1-3.fc37.aarch64"
@@ -1247,16 +1250,16 @@
     }
   },
   "metadata": {
-    "generated": "2023-03-22T00:00:00Z",
+    "generated": "2023-04-01T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2022-11-05T08:04:22Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2023-03-21T17:45:31Z"
+        "generated": "2023-03-31T22:55:48Z"
       },
       "fedora-updates": {
-        "generated": "2023-03-22T01:20:02Z"
+        "generated": "2023-04-01T01:12:45Z"
       }
     }
   }
diff --git a/manifest-lock.overrides.yaml b/manifest-lock.overrides.yaml
index 90f91662a5..62cfbe5a1d 100644
--- a/manifest-lock.overrides.yaml
+++ b/manifest-lock.overrides.yaml
@@ -8,39 +8,4 @@
 # in the `metadata.reason` key, though it's acceptable to omit a `reason`
 # for FCOS-specific packages (ignition, afterburn, etc.).
 
-packages:
-  coreos-installer:
-    evr: 0.17.0-1.fc37
-    metadata:
-      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-d6f3402ea1
-      type: fast-track
-  coreos-installer-bootinfra:
-    evr: 0.17.0-1.fc37
-    metadata:
-      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-d6f3402ea1
-      type: fast-track
-  kernel:
-    evr: 6.1.18-200.fc37
-    metadata:
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1441
-      type: pin
-  kernel-core:
-    evr: 6.1.18-200.fc37
-    metadata:
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1441
-      type: pin
-  kernel-modules:
-    evr: 6.1.18-200.fc37
-    metadata:
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1441
-      type: pin
-  nmstate:
-    evr: 2.2.8-2.fc37
-    metadata:
-      bodhi: https://bodhi.fedoraproject.org/updates/FEDORA-2023-59543876eb
-      type: fast-track
-  xfsprogs:
-    evr: 5.18.0-3.fc37
-    metadata:
-      reason: https://github.com/coreos/fedora-coreos-tracker/issues/1443
-      type: pin
+packages: {}
diff --git a/manifest-lock.ppc64le.json b/manifest-lock.ppc64le.json
index 69c7994c2e..18edb2f4e5 100644
--- a/manifest-lock.ppc64le.json
+++ b/manifest-lock.ppc64le.json
@@ -28,13 +28,13 @@
       "evra": "0.9.1-11.fc37.ppc64le"
     },
     "afterburn": {
-      "evra": "5.4.0-1.fc37.ppc64le"
+      "evra": "5.4.0-2.fc37.ppc64le"
     },
     "afterburn-dracut": {
-      "evra": "5.4.0-1.fc37.ppc64le"
+      "evra": "5.4.0-2.fc37.ppc64le"
     },
     "alternatives": {
-      "evra": "1.21-1.fc37.ppc64le"
+      "evra": "1.22-1.fc37.ppc64le"
     },
     "amd-gpu-firmware": {
       "evra": "20230310-148.fc37.noarch"
@@ -67,19 +67,19 @@
       "evra": "1.07.1-16.fc37.ppc64le"
     },
     "bind-libs": {
-      "evra": "32:9.18.12-1.fc37.ppc64le"
+      "evra": "32:9.18.13-1.fc37.ppc64le"
     },
     "bind-license": {
-      "evra": "32:9.18.12-1.fc37.noarch"
+      "evra": "32:9.18.13-1.fc37.noarch"
     },
     "bind-utils": {
-      "evra": "32:9.18.12-1.fc37.ppc64le"
+      "evra": "32:9.18.13-1.fc37.ppc64le"
     },
     "bsdtar": {
       "evra": "3.6.1-3.fc37.ppc64le"
     },
     "btrfs-progs": {
-      "evra": "6.2.1-1.fc37.ppc64le"
+      "evra": "6.2.2-1.fc37.ppc64le"
     },
     "bubblewrap": {
       "evra": "0.5.0-3.fc37.ppc64le"
@@ -136,7 +136,7 @@
       "evra": "0.21.3-3.fc37.noarch"
     },
     "container-selinux": {
-      "evra": "2:2.204.0-1.fc37.noarch"
+      "evra": "2:2.206.0-1.fc37.noarch"
     },
     "containerd": {
       "evra": "1.6.19-1.fc37.ppc64le"
@@ -175,7 +175,7 @@
       "evra": "3.17.1-3.fc37.ppc64le"
     },
     "crun": {
-      "evra": "1.8.1-1.fc37.ppc64le"
+      "evra": "1.8.3-2.fc37.ppc64le"
     },
     "crypto-policies": {
       "evra": "20220815-1.gite4ed860.fc37.noarch"
@@ -187,7 +187,7 @@
       "evra": "2.6.1-1.fc37.ppc64le"
     },
     "curl": {
-      "evra": "7.85.0-7.fc37.ppc64le"
+      "evra": "7.85.0-8.fc37.ppc64le"
     },
     "cyrus-sasl-gssapi": {
       "evra": "2.1.28-8.fc37.ppc64le"
@@ -304,7 +304,7 @@
       "evra": "1:4.9.0-2.fc37.ppc64le"
     },
     "flatpak-session-helper": {
-      "evra": "1.14.1-2.fc37.ppc64le"
+      "evra": "1.14.4-1.fc37.ppc64le"
     },
     "fstrm": {
       "evra": "0.6.1-5.fc37.ppc64le"
@@ -385,19 +385,19 @@
       "evra": "3.7-4.fc37.ppc64le"
     },
     "grub2-common": {
-      "evra": "1:2.06-88.fc37.noarch"
+      "evra": "1:2.06-89.fc37.noarch"
     },
     "grub2-ppc64le": {
-      "evra": "1:2.06-88.fc37.ppc64le"
+      "evra": "1:2.06-89.fc37.ppc64le"
     },
     "grub2-ppc64le-modules": {
-      "evra": "1:2.06-88.fc37.noarch"
+      "evra": "1:2.06-89.fc37.noarch"
     },
     "grub2-tools": {
-      "evra": "1:2.06-88.fc37.ppc64le"
+      "evra": "1:2.06-89.fc37.ppc64le"
     },
     "grub2-tools-minimal": {
-      "evra": "1:2.06-88.fc37.ppc64le"
+      "evra": "1:2.06-89.fc37.ppc64le"
     },
     "gzip": {
       "evra": "1.12-2.fc37.ppc64le"
@@ -481,13 +481,16 @@
       "evra": "2.5.1-3.fc37.noarch"
     },
     "kernel": {
-      "evra": "6.1.18-200.fc37.ppc64le"
+      "evra": "6.2.8-200.fc37.ppc64le"
     },
     "kernel-core": {
-      "evra": "6.1.18-200.fc37.ppc64le"
+      "evra": "6.2.8-200.fc37.ppc64le"
     },
     "kernel-modules": {
-      "evra": "6.1.18-200.fc37.ppc64le"
+      "evra": "6.2.8-200.fc37.ppc64le"
+    },
+    "kernel-modules-core": {
+      "evra": "6.2.8-200.fc37.ppc64le"
     },
     "kexec-tools": {
       "evra": "2.0.25-1.fc37.ppc64le"
@@ -559,7 +562,7 @@
       "evra": "1.46.5-3.fc37.ppc64le"
     },
     "libcurl-minimal": {
-      "evra": "7.85.0-7.fc37.ppc64le"
+      "evra": "7.85.0-8.fc37.ppc64le"
     },
     "libdaemon": {
       "evra": "0.14-24.fc37.ppc64le"
@@ -721,16 +724,16 @@
       "evra": "2.5.3-3.fc37.ppc64le"
     },
     "libselinux": {
-      "evra": "3.4-5.fc37.ppc64le"
+      "evra": "3.5-1.fc37.ppc64le"
     },
     "libselinux-utils": {
-      "evra": "3.4-5.fc37.ppc64le"
+      "evra": "3.5-1.fc37.ppc64le"
     },
     "libsemanage": {
-      "evra": "3.4-5.fc37.ppc64le"
+      "evra": "3.5-1.fc37.ppc64le"
     },
     "libsepol": {
-      "evra": "3.4-3.fc37.ppc64le"
+      "evra": "3.5-1.fc37.ppc64le"
     },
     "libservicelog": {
       "evra": "1.1.19-4.fc37.ppc64le"
@@ -910,7 +913,7 @@
       "evra": "1:1.0.4-3.fc37.ppc64le"
     },
     "nmstate": {
-      "evra": "2.2.8-2.fc37.ppc64le"
+      "evra": "2.2.9-2.fc37.ppc64le"
     },
     "npth": {
       "evra": "1.6-9.fc37.ppc64le"
@@ -1003,7 +1006,7 @@
       "evra": "5:4.4.2-2.fc37.ppc64le"
     },
     "policycoreutils": {
-      "evra": "3.4-6.fc37.ppc64le"
+      "evra": "3.5-1.fc37.ppc64le"
     },
     "polkit": {
       "evra": "121-4.fc37.ppc64le"
@@ -1036,7 +1039,7 @@
       "evra": "20210518-5.fc37.noarch"
     },
     "qemu-user-static-x86": {
-      "evra": "2:7.0.0-14.fc37.ppc64le"
+      "evra": "2:7.0.0-15.fc37.ppc64le"
     },
     "readline": {
       "evra": "8.2-2.fc37.ppc64le"
@@ -1096,10 +1099,10 @@
       "evra": "1.46-4.fc37.ppc64le"
     },
     "shadow-utils": {
-      "evra": "2:4.12.3-4.fc37.ppc64le"
+      "evra": "2:4.12.3-6.fc37.ppc64le"
     },
     "shadow-utils-subid": {
-      "evra": "2:4.12.3-4.fc37.ppc64le"
+      "evra": "2:4.12.3-6.fc37.ppc64le"
     },
     "shared-mime-info": {
       "evra": "2.2-2.fc37.ppc64le"
@@ -1180,7 +1183,7 @@
       "evra": "251.13-6.fc37.ppc64le"
     },
     "tar": {
-      "evra": "2:1.34-5.fc37.ppc64le"
+      "evra": "2:1.34-6.fc37.ppc64le"
     },
     "teamd": {
       "evra": "1.31-6.fc37.ppc64le"
@@ -1207,10 +1210,10 @@
       "evra": "2.38.1-1.fc37.ppc64le"
     },
     "vim-data": {
-      "evra": "2:9.0.1407-1.fc37.noarch"
+      "evra": "2:9.0.1429-1.fc37.noarch"
     },
     "vim-minimal": {
-      "evra": "2:9.0.1407-1.fc37.ppc64le"
+      "evra": "2:9.0.1429-1.fc37.ppc64le"
     },
     "which": {
       "evra": "2.21-39.fc37.ppc64le"
@@ -1219,7 +1222,7 @@
       "evra": "1.0.20210914-3.fc37.ppc64le"
     },
     "xfsprogs": {
-      "evra": "5.18.0-3.fc37.ppc64le"
+      "evra": "6.1.0-2.fc37.ppc64le"
     },
     "xxhash-libs": {
       "evra": "0.8.1-3.fc37.ppc64le"
@@ -1250,16 +1253,16 @@
     }
   },
   "metadata": {
-    "generated": "2023-03-22T00:00:00Z",
+    "generated": "2023-04-01T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2022-11-05T08:04:20Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2023-03-21T17:45:15Z"
+        "generated": "2023-03-31T22:54:50Z"
       },
       "fedora-updates": {
-        "generated": "2023-03-22T01:20:15Z"
+        "generated": "2023-04-01T01:12:59Z"
       }
     }
   }
diff --git a/manifest-lock.s390x.json b/manifest-lock.s390x.json
index 9eba9c36a2..80d21b6e81 100644
--- a/manifest-lock.s390x.json
+++ b/manifest-lock.s390x.json
@@ -28,13 +28,13 @@
       "evra": "0.9.1-11.fc37.s390x"
     },
     "afterburn": {
-      "evra": "5.4.0-1.fc37.s390x"
+      "evra": "5.4.0-2.fc37.s390x"
     },
     "afterburn-dracut": {
-      "evra": "5.4.0-1.fc37.s390x"
+      "evra": "5.4.0-2.fc37.s390x"
     },
     "alternatives": {
-      "evra": "1.21-1.fc37.s390x"
+      "evra": "1.22-1.fc37.s390x"
     },
     "amd-gpu-firmware": {
       "evra": "20230310-148.fc37.noarch"
@@ -64,19 +64,19 @@
       "evra": "1:2.11-8.fc37.noarch"
     },
     "bind-libs": {
-      "evra": "32:9.18.12-1.fc37.s390x"
+      "evra": "32:9.18.13-1.fc37.s390x"
     },
     "bind-license": {
-      "evra": "32:9.18.12-1.fc37.noarch"
+      "evra": "32:9.18.13-1.fc37.noarch"
     },
     "bind-utils": {
-      "evra": "32:9.18.12-1.fc37.s390x"
+      "evra": "32:9.18.13-1.fc37.s390x"
     },
     "bsdtar": {
       "evra": "3.6.1-3.fc37.s390x"
     },
     "btrfs-progs": {
-      "evra": "6.2.1-1.fc37.s390x"
+      "evra": "6.2.2-1.fc37.s390x"
     },
     "bubblewrap": {
       "evra": "0.5.0-3.fc37.s390x"
@@ -133,7 +133,7 @@
       "evra": "0.21.3-3.fc37.noarch"
     },
     "container-selinux": {
-      "evra": "2:2.204.0-1.fc37.noarch"
+      "evra": "2:2.206.0-1.fc37.noarch"
     },
     "containerd": {
       "evra": "1.6.19-1.fc37.s390x"
@@ -172,7 +172,7 @@
       "evra": "3.17.1-3.fc37.s390x"
     },
     "crun": {
-      "evra": "1.8.1-1.fc37.s390x"
+      "evra": "1.8.3-2.fc37.s390x"
     },
     "crypto-policies": {
       "evra": "20220815-1.gite4ed860.fc37.noarch"
@@ -184,7 +184,7 @@
       "evra": "2.6.1-1.fc37.s390x"
     },
     "curl": {
-      "evra": "7.85.0-7.fc37.s390x"
+      "evra": "7.85.0-8.fc37.s390x"
     },
     "cyrus-sasl-gssapi": {
       "evra": "2.1.28-8.fc37.s390x"
@@ -301,7 +301,7 @@
       "evra": "1:4.9.0-2.fc37.s390x"
     },
     "flatpak-session-helper": {
-      "evra": "1.14.1-2.fc37.s390x"
+      "evra": "1.14.4-1.fc37.s390x"
     },
     "fstrm": {
       "evra": "0.6.1-5.fc37.s390x"
@@ -448,13 +448,16 @@
       "evra": "2.5.1-3.fc37.noarch"
     },
     "kernel": {
-      "evra": "6.1.18-200.fc37.s390x"
+      "evra": "6.2.8-200.fc37.s390x"
     },
     "kernel-core": {
-      "evra": "6.1.18-200.fc37.s390x"
+      "evra": "6.2.8-200.fc37.s390x"
     },
     "kernel-modules": {
-      "evra": "6.1.18-200.fc37.s390x"
+      "evra": "6.2.8-200.fc37.s390x"
+    },
+    "kernel-modules-core": {
+      "evra": "6.2.8-200.fc37.s390x"
     },
     "kexec-tools": {
       "evra": "2.0.25-1.fc37.s390x"
@@ -526,7 +529,7 @@
       "evra": "1.46.5-3.fc37.s390x"
     },
     "libcurl-minimal": {
-      "evra": "7.85.0-7.fc37.s390x"
+      "evra": "7.85.0-8.fc37.s390x"
     },
     "libdaemon": {
       "evra": "0.14-24.fc37.s390x"
@@ -673,16 +676,16 @@
       "evra": "2.5.3-3.fc37.s390x"
     },
     "libselinux": {
-      "evra": "3.4-5.fc37.s390x"
+      "evra": "3.5-1.fc37.s390x"
     },
     "libselinux-utils": {
-      "evra": "3.4-5.fc37.s390x"
+      "evra": "3.5-1.fc37.s390x"
     },
     "libsemanage": {
-      "evra": "3.4-5.fc37.s390x"
+      "evra": "3.5-1.fc37.s390x"
     },
     "libsepol": {
-      "evra": "3.4-3.fc37.s390x"
+      "evra": "3.5-1.fc37.s390x"
     },
     "libsigsegv": {
       "evra": "2.14-3.fc37.s390x"
@@ -853,7 +856,7 @@
       "evra": "1:1.0.4-3.fc37.s390x"
     },
     "nmstate": {
-      "evra": "2.2.8-2.fc37.s390x"
+      "evra": "2.2.9-2.fc37.s390x"
     },
     "npth": {
       "evra": "1.6-9.fc37.s390x"
@@ -937,7 +940,7 @@
       "evra": "5:4.4.2-2.fc37.s390x"
     },
     "policycoreutils": {
-      "evra": "3.4-6.fc37.s390x"
+      "evra": "3.5-1.fc37.s390x"
     },
     "polkit": {
       "evra": "121-4.fc37.s390x"
@@ -964,7 +967,7 @@
       "evra": "20210518-5.fc37.noarch"
     },
     "qemu-user-static-x86": {
-      "evra": "2:7.0.0-14.fc37.s390x"
+      "evra": "2:7.0.0-15.fc37.s390x"
     },
     "readline": {
       "evra": "8.2-2.fc37.s390x"
@@ -1024,10 +1027,10 @@
       "evra": "1.46-4.fc37.s390x"
     },
     "shadow-utils": {
-      "evra": "2:4.12.3-4.fc37.s390x"
+      "evra": "2:4.12.3-6.fc37.s390x"
     },
     "shadow-utils-subid": {
-      "evra": "2:4.12.3-4.fc37.s390x"
+      "evra": "2:4.12.3-6.fc37.s390x"
     },
     "skopeo": {
       "evra": "1:1.11.1-1.fc37.s390x"
@@ -1105,7 +1108,7 @@
       "evra": "251.13-6.fc37.s390x"
     },
     "tar": {
-      "evra": "2:1.34-5.fc37.s390x"
+      "evra": "2:1.34-6.fc37.s390x"
     },
     "teamd": {
       "evra": "1.31-6.fc37.s390x"
@@ -1135,10 +1138,10 @@
       "evra": "2.6.1-1.fc37.s390x"
     },
     "vim-data": {
-      "evra": "2:9.0.1407-1.fc37.noarch"
+      "evra": "2:9.0.1429-1.fc37.noarch"
     },
     "vim-minimal": {
-      "evra": "2:9.0.1407-1.fc37.s390x"
+      "evra": "2:9.0.1429-1.fc37.s390x"
     },
     "which": {
       "evra": "2.21-39.fc37.s390x"
@@ -1147,7 +1150,7 @@
       "evra": "1.0.20210914-3.fc37.s390x"
     },
     "xfsprogs": {
-      "evra": "5.18.0-3.fc37.s390x"
+      "evra": "6.1.0-2.fc37.s390x"
     },
     "xxhash-libs": {
       "evra": "0.8.1-3.fc37.s390x"
@@ -1178,16 +1181,16 @@
     }
   },
   "metadata": {
-    "generated": "2023-03-22T00:00:00Z",
+    "generated": "2023-04-01T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2022-11-05T08:04:18Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2023-03-21T17:45:41Z"
+        "generated": "2023-03-31T22:54:20Z"
       },
       "fedora-updates": {
-        "generated": "2023-03-22T01:20:22Z"
+        "generated": "2023-04-01T01:13:06Z"
       }
     }
   }
diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
index ae4ba77f2e..ea332965a3 100644
--- a/manifest-lock.x86_64.json
+++ b/manifest-lock.x86_64.json
@@ -28,13 +28,13 @@
       "evra": "0.9.1-11.fc37.x86_64"
     },
     "afterburn": {
-      "evra": "5.4.0-1.fc37.x86_64"
+      "evra": "5.4.0-2.fc37.x86_64"
     },
     "afterburn-dracut": {
-      "evra": "5.4.0-1.fc37.x86_64"
+      "evra": "5.4.0-2.fc37.x86_64"
     },
     "alternatives": {
-      "evra": "1.21-1.fc37.x86_64"
+      "evra": "1.22-1.fc37.x86_64"
     },
     "amd-gpu-firmware": {
       "evra": "20230310-148.fc37.noarch"
@@ -64,13 +64,13 @@
       "evra": "1:2.11-8.fc37.noarch"
     },
     "bind-libs": {
-      "evra": "32:9.18.12-1.fc37.x86_64"
+      "evra": "32:9.18.13-1.fc37.x86_64"
     },
     "bind-license": {
-      "evra": "32:9.18.12-1.fc37.noarch"
+      "evra": "32:9.18.13-1.fc37.noarch"
     },
     "bind-utils": {
-      "evra": "32:9.18.12-1.fc37.x86_64"
+      "evra": "32:9.18.13-1.fc37.x86_64"
     },
     "bootupd": {
       "evra": "0.2.8-3.fc37.x86_64"
@@ -79,7 +79,7 @@
       "evra": "3.6.1-3.fc37.x86_64"
     },
     "btrfs-progs": {
-      "evra": "6.2.1-1.fc37.x86_64"
+      "evra": "6.2.2-1.fc37.x86_64"
     },
     "bubblewrap": {
       "evra": "0.5.0-3.fc37.x86_64"
@@ -136,7 +136,7 @@
       "evra": "0.21.3-3.fc37.noarch"
     },
     "container-selinux": {
-      "evra": "2:2.204.0-1.fc37.noarch"
+      "evra": "2:2.206.0-1.fc37.noarch"
     },
     "containerd": {
       "evra": "1.6.19-1.fc37.x86_64"
@@ -175,7 +175,7 @@
       "evra": "3.17.1-3.fc37.x86_64"
     },
     "crun": {
-      "evra": "1.8.1-1.fc37.x86_64"
+      "evra": "1.8.3-2.fc37.x86_64"
     },
     "crypto-policies": {
       "evra": "20220815-1.gite4ed860.fc37.noarch"
@@ -187,7 +187,7 @@
       "evra": "2.6.1-1.fc37.x86_64"
     },
     "curl": {
-      "evra": "7.85.0-7.fc37.x86_64"
+      "evra": "7.85.0-8.fc37.x86_64"
     },
     "cyrus-sasl-gssapi": {
       "evra": "2.1.28-8.fc37.x86_64"
@@ -313,7 +313,7 @@
       "evra": "1:4.9.0-2.fc37.x86_64"
     },
     "flatpak-session-helper": {
-      "evra": "1.14.1-2.fc37.x86_64"
+      "evra": "1.14.4-1.fc37.x86_64"
     },
     "fstrm": {
       "evra": "0.6.1-5.fc37.x86_64"
@@ -394,22 +394,22 @@
       "evra": "3.7-4.fc37.x86_64"
     },
     "grub2-common": {
-      "evra": "1:2.06-88.fc37.noarch"
+      "evra": "1:2.06-89.fc37.noarch"
     },
     "grub2-efi-x64": {
-      "evra": "1:2.06-88.fc37.x86_64"
+      "evra": "1:2.06-89.fc37.x86_64"
     },
     "grub2-pc": {
-      "evra": "1:2.06-88.fc37.x86_64"
+      "evra": "1:2.06-89.fc37.x86_64"
     },
     "grub2-pc-modules": {
-      "evra": "1:2.06-88.fc37.noarch"
+      "evra": "1:2.06-89.fc37.noarch"
     },
     "grub2-tools": {
-      "evra": "1:2.06-88.fc37.x86_64"
+      "evra": "1:2.06-89.fc37.x86_64"
     },
     "grub2-tools-minimal": {
-      "evra": "1:2.06-88.fc37.x86_64"
+      "evra": "1:2.06-89.fc37.x86_64"
     },
     "gzip": {
       "evra": "1.12-2.fc37.x86_64"
@@ -493,13 +493,16 @@
       "evra": "2.5.1-3.fc37.noarch"
     },
     "kernel": {
-      "evra": "6.1.18-200.fc37.x86_64"
+      "evra": "6.2.8-200.fc37.x86_64"
     },
     "kernel-core": {
-      "evra": "6.1.18-200.fc37.x86_64"
+      "evra": "6.2.8-200.fc37.x86_64"
     },
     "kernel-modules": {
-      "evra": "6.1.18-200.fc37.x86_64"
+      "evra": "6.2.8-200.fc37.x86_64"
+    },
+    "kernel-modules-core": {
+      "evra": "6.2.8-200.fc37.x86_64"
     },
     "kexec-tools": {
       "evra": "2.0.25-1.fc37.x86_64"
@@ -571,7 +574,7 @@
       "evra": "1.46.5-3.fc37.x86_64"
     },
     "libcurl-minimal": {
-      "evra": "7.85.0-7.fc37.x86_64"
+      "evra": "7.85.0-8.fc37.x86_64"
     },
     "libdaemon": {
       "evra": "0.14-24.fc37.x86_64"
@@ -730,16 +733,16 @@
       "evra": "2.5.3-3.fc37.x86_64"
     },
     "libselinux": {
-      "evra": "3.4-5.fc37.x86_64"
+      "evra": "3.5-1.fc37.x86_64"
     },
     "libselinux-utils": {
-      "evra": "3.4-5.fc37.x86_64"
+      "evra": "3.5-1.fc37.x86_64"
     },
     "libsemanage": {
-      "evra": "3.4-5.fc37.x86_64"
+      "evra": "3.5-1.fc37.x86_64"
     },
     "libsepol": {
-      "evra": "3.4-3.fc37.x86_64"
+      "evra": "3.5-1.fc37.x86_64"
     },
     "libsigsegv": {
       "evra": "2.14-3.fc37.x86_64"
@@ -925,7 +928,7 @@
       "evra": "1:1.0.4-3.fc37.x86_64"
     },
     "nmstate": {
-      "evra": "2.2.8-2.fc37.x86_64"
+      "evra": "2.2.9-2.fc37.x86_64"
     },
     "npth": {
       "evra": "1.6-9.fc37.x86_64"
@@ -1015,7 +1018,7 @@
       "evra": "5:4.4.2-2.fc37.x86_64"
     },
     "policycoreutils": {
-      "evra": "3.4-6.fc37.x86_64"
+      "evra": "3.5-1.fc37.x86_64"
     },
     "polkit": {
       "evra": "121-4.fc37.x86_64"
@@ -1096,10 +1099,10 @@
       "evra": "1.46-4.fc37.x86_64"
     },
     "shadow-utils": {
-      "evra": "2:4.12.3-4.fc37.x86_64"
+      "evra": "2:4.12.3-6.fc37.x86_64"
     },
     "shadow-utils-subid": {
-      "evra": "2:4.12.3-4.fc37.x86_64"
+      "evra": "2:4.12.3-6.fc37.x86_64"
     },
     "shared-mime-info": {
       "evra": "2.2-2.fc37.x86_64"
@@ -1186,7 +1189,7 @@
       "evra": "251.13-6.fc37.x86_64"
     },
     "tar": {
-      "evra": "2:1.34-5.fc37.x86_64"
+      "evra": "2:1.34-6.fc37.x86_64"
     },
     "teamd": {
       "evra": "1.31-6.fc37.x86_64"
@@ -1213,10 +1216,10 @@
       "evra": "2.38.1-1.fc37.x86_64"
     },
     "vim-data": {
-      "evra": "2:9.0.1407-1.fc37.noarch"
+      "evra": "2:9.0.1429-1.fc37.noarch"
     },
     "vim-minimal": {
-      "evra": "2:9.0.1407-1.fc37.x86_64"
+      "evra": "2:9.0.1429-1.fc37.x86_64"
     },
     "which": {
       "evra": "2.21-39.fc37.x86_64"
@@ -1225,7 +1228,7 @@
       "evra": "1.0.20210914-3.fc37.x86_64"
     },
     "xfsprogs": {
-      "evra": "5.18.0-3.fc37.x86_64"
+      "evra": "6.1.0-2.fc37.x86_64"
     },
     "xxhash-libs": {
       "evra": "0.8.1-3.fc37.x86_64"
@@ -1256,16 +1259,16 @@
     }
   },
   "metadata": {
-    "generated": "2023-03-22T00:00:00Z",
+    "generated": "2023-04-01T00:00:00Z",
     "rpmmd_repos": {
       "fedora": {
         "generated": "2022-11-05T08:04:38Z"
       },
       "fedora-coreos-pool": {
-        "generated": "2023-03-21T17:47:06Z"
+        "generated": "2023-03-31T22:55:58Z"
       },
       "fedora-updates": {
-        "generated": "2023-03-22T01:20:28Z"
+        "generated": "2023-04-01T01:13:13Z"
       }
     }
   }
diff --git a/manifests/shared-workarounds.yaml b/manifests/shared-workarounds.yaml
index 06c1ca685f..500582942b 100644
--- a/manifests/shared-workarounds.yaml
+++ b/manifests/shared-workarounds.yaml
@@ -1,34 +1,2 @@
 # This manifest is a list of shared workarounds that are needed in both Fedora CoreOS
 # and downstreams (i.e. Red Hat CoreOS).
-
-postprocess:
-  # Put in the fix for multipathd.service in dracut on releases that haven't
-  # been fixed yet.
-  # https://github.com/dracutdevs/dracut/pull/1606
-  # https://github.com/coreos/fedora-coreos-config/pull/1233
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-    source /etc/os-release
-    # This has landed in Fedora but not in any version of RHEL yet
-    if [[ ${ID} != "rhel" ]]; then
-        exit 0
-    fi
-    mkdir /usr/lib/dracut/modules.d/36coreos-multipath-fix
-    cat > /usr/lib/dracut/modules.d/36coreos-multipath-fix/90-multipathd-remove-execstop.conf <<'EOF'
-    # Temporary workaround for https://github.com/dracutdevs/dracut/pull/1606.
-    [Service]
-    ExecStop=
-    EOF
-    cat > /usr/lib/dracut/modules.d/36coreos-multipath-fix/module-setup.sh <<'EOF'
-    #!/bin/bash
-    # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-    # ex: ts=8 sw=4 sts=4 et filetype=sh
-    install() {
-        # Temporary workaround for https://github.com/dracutdevs/dracut/pull/1606.
-        mkdir -p "$systemdsystemunitdir/multipathd.service.d"
-        inst_simple "$moddir/90-multipathd-remove-execstop.conf" \
-        "$systemdsystemunitdir/multipathd.service.d/90-multipathd-remove-execstop.conf"
-    }
-    EOF
-    chmod +x /usr/lib/dracut/modules.d/36coreos-multipath-fix/module-setup.sh
diff --git a/overlay.d/05core/usr/lib/dracut/dracut.conf.d/coreos-omits.conf b/overlay.d/05core/usr/lib/dracut/dracut.conf.d/coreos-omits.conf
index 6a32713b9f..3833a163ba 100644
--- a/overlay.d/05core/usr/lib/dracut/dracut.conf.d/coreos-omits.conf
+++ b/overlay.d/05core/usr/lib/dracut/dracut.conf.d/coreos-omits.conf
@@ -12,4 +12,4 @@ omit_dracutmodules+=" systemd-networkd network-legacy network-wicked "
 # We use systemd network naming
 omit_dracutmodules+=" biosdevname "
 # Random stuff we don't want
-omit_dracutmodules+=" rngd busybox dbus-daemon memstrack pcsc bluetooth "
+omit_dracutmodules+=" dbus-daemon memstrack "
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target
index b003f4d94b..e0fd500cd4 100644
--- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target
@@ -8,6 +8,9 @@ After=dev-disk-by\x2dlabel-dm\x2dmpath\x2dboot.device
 Requires=multipathd.service
 After=multipathd.service
 
+OnFailure=emergency.target
+OnFailureJobMode=isolate
+
 # This is already enforced transitively by coreos-gpt-setup.service, but
 # let's be more explicit and list it directly here too.
 Before=coreos-ignition-setup-user.service
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-firstboot-uuid b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-firstboot-uuid
index 21aca809e9..78e2fa70a0 100755
--- a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-firstboot-uuid
+++ b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-firstboot-uuid
@@ -62,10 +62,6 @@ if [ "${TYPE}" == "${orig_type}" ] && [ "${UUID}" == "${orig_uuid}" ]; then
     *) echo "unexpected filesystem type ${TYPE}" 1>&2; exit 1 ;;
   esac
   udevadm settle || :
-  # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2162151.
-  # We nuke the blkid cache containing stale UUIDs so that future blkid calls
-  # (or tools leveraging libblkid) will be forced to re-probe.
-  rm -rf /run/blkid
   echo "Regenerated UUID for ${target}"
 else
   echo "No changes required for ${target} TYPE=${TYPE} UUID=${UUID}"
diff --git a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
index 4e4e9da284..fd18bec843 100644
--- a/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
+++ b/overlay.d/15fcos/usr/lib/systemd/system-preset/45-fcos.preset
@@ -1,6 +1,3 @@
 enable coreos-check-ssh-keys.service
 # Check if cgroupsv1 is still being used
 enable coreos-check-cgroups.service
-# Upgrade aarch64 bootloader to avoid
-# https://github.com/coreos/fedora-coreos-tracker/issues/1441
-enable coreos-bootupctl-update-aarch64.service
diff --git a/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service b/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service
deleted file mode 100644
index 43c9312e9d..0000000000
--- a/overlay.d/15fcos/usr/lib/systemd/system/coreos-bootupctl-update-aarch64.service
+++ /dev/null
@@ -1,15 +0,0 @@
-# Remove after the next barrier release
-# https://github.com/coreos/fedora-coreos-tracker/issues/1441
-
-[Unit]
-Description=Update aarch64 Bootloader
-ConditionArchitecture=arm64
-ConditionFirmware=uefi
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/bootupctl update
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/overlay.d/20platform-chrony/usr/libexec/coreos-platform-chrony-config b/overlay.d/20platform-chrony/usr/libexec/coreos-platform-chrony-config
index 4f69312f74..41e6c0b951 100755
--- a/overlay.d/20platform-chrony/usr/libexec/coreos-platform-chrony-config
+++ b/overlay.d/20platform-chrony/usr/libexec/coreos-platform-chrony-config
@@ -18,6 +18,10 @@ if ! cmp {/usr,}/etc/chrony.conf >/dev/null; then
     echo "$self: /etc/chrony.conf is modified; not changing the default"
     exit 0
 fi
+if ! cmp {/usr,}/etc/sysconfig/chronyd >/dev/null; then
+    echo "$self: /etc/sysconfig/chronyd is modified; not changing the default"
+    exit 0
+fi
 
 mkdir -p /run/coreos
 confpath=/run/coreos/platform-chrony.conf
diff --git a/tests/kola/butane/grub-users/config.bu b/tests/kola/butane/grub-users/config.bu
index 10e389fa38..b29a490d51 100644
--- a/tests/kola/butane/grub-users/config.bu
+++ b/tests/kola/butane/grub-users/config.bu
@@ -1,5 +1,5 @@
 variant: fcos
-version: 1.5.0-experimental
+version: 1.5.0
 grub:
   users:
     - name: bovik
diff --git a/tests/kola/ignition/resource/authenticated-s3/config.bu b/tests/kola/ignition/resource/authenticated-s3/config.bu
index 73921033ec..444a258a72 100644
--- a/tests/kola/ignition/resource/authenticated-s3/config.bu
+++ b/tests/kola/ignition/resource/authenticated-s3/config.bu
@@ -2,7 +2,7 @@
 # associated with the instance
 
 variant: fcos
-version: 1.5.0-experimental
+version: 1.5.0
 ignition:
   config:
     merge:
diff --git a/tests/kola/ignition/resource/remote/config.bu b/tests/kola/ignition/resource/remote/config.bu
index b9e0b15f1e..ea45d98587 100644
--- a/tests/kola/ignition/resource/remote/config.bu
+++ b/tests/kola/ignition/resource/remote/config.bu
@@ -1,5 +1,5 @@
 variant: fcos
-version: 1.5.0-experimental
+version: 1.5.0
 storage:
   files:
     - path: /var/resource/http
diff --git a/tests/kola/multipath/data/commonlib.sh b/tests/kola/multipath/data/commonlib.sh
deleted file mode 120000
index 1742d51e67..0000000000
--- a/tests/kola/multipath/data/commonlib.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../data/commonlib.sh
\ No newline at end of file
diff --git a/tests/kola/multipath/multipathd-service-fix b/tests/kola/multipath/multipathd-service-fix
deleted file mode 100755
index 30646ca468..0000000000
--- a/tests/kola/multipath/multipathd-service-fix
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-## kola:
-##   tags: "platform-independent"
-##   exclusive: false
-
-set -xeuo pipefail
-
-. $KOLA_EXT_DATA/commonlib.sh
-
-# We need either a fixed dracut or temporary workaround, no need for both.
-# See https://github.com/coreos/fedora-coreos-tracker/issues/803.
-has_fixed_dracut_multipathd_service=0
-grep -q 'ExecStop=/sbin/multipathd shutdown' /usr/lib/dracut/modules.d/90multipath/multipathd.service || has_fixed_dracut_multipathd_service=1
-has_overlay_multipathd_service_quickfix=1
-test -f /usr/lib/dracut/modules.d/36coreos-multipath-fix/90-multipathd-remove-execstop.conf || has_overlay_multipathd_service_quickfix=0
-if test "${has_fixed_dracut_multipathd_service}" -eq "${has_overlay_multipathd_service_quickfix}"; then
-    if test "${has_fixed_dracut_multipathd_service}" -eq 1; then
-        fatal "Found fixed dracut multipath module but quickfix is present too"
-    else
-        fatal "Found buggy dracut multipath module but quickfix is missing too"
-    fi
-fi
-ok "either dracut multipath module fixed or quickfix present"
diff --git a/tests/kola/upgrade/extended/config.bu b/tests/kola/upgrade/extended/config.bu
new file mode 100644
index 0000000000..671e295a4e
--- /dev/null
+++ b/tests/kola/upgrade/extended/config.bu
@@ -0,0 +1,24 @@
+variant: fcos
+# Must use version 1.0.0 here to use Ignition spec 3.0.0 for
+# our oldest supported starting points (i.e. 31.20200108.3.0)
+version: 1.0.0
+storage:
+  files:
+    - path: /etc/systemd/journald.conf.d/forward-to-console.conf
+      mode: 0644
+      contents:
+        inline: |
+          # Send journal messages to the console. This is so we can see the
+          # progress even after autopkgtest-reboot-prepare has been called.
+          [Journal]
+          ForwardToConsole=yes
+    - path: /etc/zincati/config.d/99-config.toml
+      mode: 0644
+      contents:
+        inline: |
+          # Don't wait for any rollout window, update ASAP
+          [identity]
+          rollout_wariness = 0.0000
+          # Increase the frequency at which we check for updates
+          [agent.timing]
+          steady_interval_secs = 20
diff --git a/tests/kola/upgrade/extended/data/commonlib.sh b/tests/kola/upgrade/extended/data/commonlib.sh
new file mode 120000
index 0000000000..b8dcbdca1a
--- /dev/null
+++ b/tests/kola/upgrade/extended/data/commonlib.sh
@@ -0,0 +1 @@
+../../../data/commonlib.sh
\ No newline at end of file
diff --git a/tests/kola/upgrade/extended/test.sh b/tests/kola/upgrade/extended/test.sh
new file mode 100755
index 0000000000..3bd7b43efc
--- /dev/null
+++ b/tests/kola/upgrade/extended/test.sh
@@ -0,0 +1,167 @@
+#!/bin/bash
+## kola:
+##   # - needs-internet: to pull updates
+##   tags: "needs-internet"
+##   # Extend the timeout since a lot of updates/reboots can happen.
+##   timeoutMin: 45
+##   # Only run this test when specifically requested.
+##   requiredTag: extended-upgrade
+
+set -eux -o pipefail
+
+. $KOLA_EXT_DATA/commonlib.sh
+
+# This test will attempt to test an upgrade from a given starting
+# point (assumed by the caller passing in a specific
+# `cosa kola run --build=x.y.z`) all the way to the latest build
+# that is staged to be released. The test is basic in that it
+# essentially tests 1) updates work 2) boot works.
+#
+# An example invocation for this test would look like:
+
+# ```
+# cosa buildfetch --stream=next --build=34.20210904.1.0 --artifact=qemu
+# cosa decompress --build=34.20210904.1.0
+# cosa kola run --build=34.20210904.1.0 --tag extended-upgrade
+# ```
+#
+# You can monitor the progress from the console and journal:
+#   - everything:
+#       - tail -f tmp/kola/ext.config.upgrade.extended/*/console.txt
+#   - major events:
+#       - tail -f tmp/kola/ext.config.upgrade.extended/*/journal.txt | grep --color -i 'ok reached version'
+#
+# For convenience, here is a list of the earliest releases on each
+# stream/architecture. x86_64 minimum version has to be 32.x because
+# of https://github.com/coreos/fedora-coreos-tracker/issues/1448
+#
+# stable
+#   - x86_64  31.20200108.3.0 -> works for BIOS, not UEFI
+#             32.20200601.3.0
+#   - aarch64 34.20210821.3.0
+#   - s390x   36.20220618.3.1
+# testing
+#   - x86_64  32.20200601.2.1
+#   - aarch64 34.20210904.2.0
+#   - s390x   36.20220618.2.0
+# next
+#   - x86_64  32.20200416.1.0
+#   - aarch64 34.20210904.1.0
+#   - s390x   36.20220618.1.1
+
+. /etc/os-release # for $VERSION_ID
+
+# delete the disabling of updates that was done by the test framework
+if [ -f /etc/zincati/config.d/90-disable-auto-updates.toml ]; then
+    rm -f /etc/zincati/config.d/90-disable-auto-updates.toml
+    systemctl restart zincati
+fi
+
+version=$(rpm-ostree status  --json | jq -r '.deployments[0].version')
+stream=$(rpm-ostree status  --json | jq -r '.deployments[0]["base-commit-meta"]["fedora-coreos.stream"]')
+
+# Pick up the last release for the current stream
+test -f /srv/releases.json || \
+    curl -L "https://builds.coreos.fedoraproject.org/prod/streams/${stream}/releases.json" > /srv/releases.json
+last_release=$(jq -r .releases[-1].version /srv/releases.json)
+
+# If the user dropped down a /etc/target_stream file then we'll
+# pick up the info from there.
+target_stream=$stream
+test -f /etc/target_stream && target_stream=$(< /etc/target_stream)
+test -f /srv/builds.json || \
+    curl -L "https://builds.coreos.fedoraproject.org/prod/streams/${target_stream}/builds/builds.json" > /srv/builds.json
+target_version=$(jq -r .builds[0].id /srv/builds.json)
+
+
+grab-gpg-keys() {
+    # For older FCOS we had an issue where when we tried to pull the
+    # commits from the repo it would fail if we were on N-2 because
+    # the newer commits would be signed with a key the old OS didn't
+    # know anything about. We applied a workaround in newer releases,
+    # so this workaround should be limited to zincati older than v0.0.24
+    # https://github.com/coreos/fedora-coreos-tracker/issues/749
+    max_version=${target_version:0:2} # i.e. 36, 37, 38, etc..
+    for ver in $(seq $VERSION_ID $max_version); do
+        test -e "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${ver}-primary" && continue
+        curl -L "https://src.fedoraproject.org/rpms/fedora-repos/raw/rawhide/f/RPM-GPG-KEY-fedora-${ver}-primary" | \
+            sudo tee "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${ver}-primary"
+        sudo chcon -v --reference="/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${VERSION_ID}-primary" "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-${ver}-primary"
+    done
+}
+
+fix-update-url() {
+    # We switched to non stg URL in zincati v0.0.10 [1]. For older clients
+    # we need to update the runtime configuration of zincati to get past the problem.
+    # [1] https://github.com/coreos/zincati/commit/1d73801ccd015cdce89f082cb1eeb9b4b8335760
+    cat <<'EOF' > /run/zincati/config.d/50-fedora-coreos-cincinnati.toml
+[cincinnati]
+base_url= "https://updates.coreos.fedoraproject.org"
+EOF
+    systemctl restart zincati
+}
+
+ok "Reached version: $version"
+
+# Are we all the way at the desired target version?
+# If so then we can exit with success!
+if vereq $version $target_version; then
+    ok "Fully upgraded to $target_version"
+    # log bootupctl information for inspection where available
+    [ -f /usr/bin/bootupctl ] && /usr/bin/bootupctl status
+    exit 0
+fi
+
+# Apply workarounds based on the current version of the system.
+#
+# First release on each stream with new enough zincati for updates stg.fedoraprojec.org
+# - 31.20200505.3.0
+# - 31.20200505.2.0
+# - 32.20200505.1.0
+#
+# First release with new enough zincati with workaround for N-2 gpg key issue
+# - 35.20211119.3.0
+# - 35.20211119.2.0
+# - 35.20211119.1.0
+#
+case "$stream" in
+    'next')
+        verlt $version '35.20211119.1.0' && grab-gpg-keys
+        verlt $version '31.20200505.1.0' && fix-update-url
+        ;;
+    'testing')
+        verlt $version '35.20211119.2.0' && grab-gpg-keys
+        verlt $version '31.20200505.2.0' && fix-update-url
+        ;;
+    'stable')
+        verlt $version '35.20211119.3.0' && grab-gpg-keys
+        verlt $version '31.20200505.3.0' && fix-update-url
+        ;;
+    *) fatal "unexpected stream: $stream";;
+esac
+
+# If we have made it all the way to the last release then
+# we have one more test. We'll now rebase to the target
+# version, which should be in the compose OSTree repo.
+if vereq $version $last_release; then
+    systemctl stop zincati
+    rpm-ostree rebase "fedora-compose:fedora/$(arch)/coreos/${target_stream}" $target_version
+    /tmp/autopkgtest-reboot reboot # execute the reboot
+    sleep infinity
+fi
+
+# Watch the Zincati logs to see if it got a lead on a new update.
+# Timeout after some time if no update. Unset pipefail since the
+# journalctl -f will give a bad exit code when grep exits early.
+set +o pipefail
+cmd="journalctl -b 0 -f --no-tail -u zincati.service"
+if ! timeout 90s $cmd | grep --max-count=1 'proceeding to stage it'; then
+    # No update initiated within timeout; let's error.
+    fatal "Updating the system stalled out on version: $version"
+fi
+set -o pipefail
+
+
+# OK update has been initiated, prepare for reboot and sleep
+/tmp/autopkgtest-reboot-prepare reboot
+sleep infinity