diff --git a/tier-1/autoupdates.yaml b/tier-1/autoupdates.yaml
deleted file mode 120000
index 9c9cbd1..0000000
--- a/tier-1/autoupdates.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/autoupdates.yaml
\ No newline at end of file
diff --git a/tier-1/basic-fixes.yaml b/tier-1/basic-fixes.yaml
deleted file mode 120000
index d3d038c..0000000
--- a/tier-1/basic-fixes.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/basic-fixes.yaml
\ No newline at end of file
diff --git a/tier-1/bootc-config.yaml b/tier-1/bootc-config.yaml
deleted file mode 120000
index 9f9c8ab..0000000
--- a/tier-1/bootc-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/bootc-config.yaml
\ No newline at end of file
diff --git a/tier-1/bootc.yaml b/tier-1/bootc.yaml
deleted file mode 120000
index e4ff72c..0000000
--- a/tier-1/bootc.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/bootc.yaml
\ No newline at end of file
diff --git a/tier-1/bootupd.yaml b/tier-1/bootupd.yaml
deleted file mode 120000
index 6b1db4e..0000000
--- a/tier-1/bootupd.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/bootupd.yaml
\ No newline at end of file
diff --git a/tier-1/group b/tier-1/group
deleted file mode 120000
index f4ca078..0000000
--- a/tier-1/group
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/group
\ No newline at end of file
diff --git a/tier-1/grub2-removals.yaml b/tier-1/grub2-removals.yaml
deleted file mode 120000
index 7fecbad..0000000
--- a/tier-1/grub2-removals.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/grub2-removals.yaml
\ No newline at end of file
diff --git a/tier-1/initramfs.yaml b/tier-1/initramfs.yaml
deleted file mode 120000
index c268845..0000000
--- a/tier-1/initramfs.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/initramfs.yaml
\ No newline at end of file
diff --git a/tier-1/kdump-aarch64-aws-workaround.yaml b/tier-1/kdump-aarch64-aws-workaround.yaml
deleted file mode 100644
index c198739..0000000
--- a/tier-1/kdump-aarch64-aws-workaround.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file includes a fixup for kdump on aarch64 AWS instances.
-# The issue seems specific to aarch64 AWS instances, but we'll go
-# ahead and apply it across the board for aarch64, since that's
-# the easiest thing to do. Hopefully the upstream issue will get
-# resolved soon.
-postprocess:
-  - |
-    #!/usr/bin/env bash
-    # Remove irqpoll from the list of KDUMP_COMMANDLINE_APPEND. This
-    # causes issues on aarch64 AWS instances.
-    # https://github.com/coreos/fedora-coreos-tracker/issues/1187
-    sed -i -e 's/irqpoll //' /etc/sysconfig/kdump
diff --git a/tier-1/manifest-tier-0.yaml b/tier-1/manifest-tier-0.yaml
deleted file mode 120000
index 8d5a3e1..0000000
--- a/tier-1/manifest-tier-0.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/manifest.yaml
\ No newline at end of file
diff --git a/tier-1/manifest.yaml b/tier-1/manifest.yaml
index 2242b17..420ff54 100644
--- a/tier-1/manifest.yaml
+++ b/tier-1/manifest.yaml
@@ -2,7 +2,7 @@
 recommends: true
 
 include:
-  - manifest-tier-0.yaml
+  - ../tier-0/manifest.yaml
   - bootable-rpm-ostree.yaml
   - podman.yaml
   - firmware.yaml
diff --git a/tier-1/ostree.yaml b/tier-1/ostree.yaml
deleted file mode 120000
index 174954e..0000000
--- a/tier-1/ostree.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/ostree.yaml
\ No newline at end of file
diff --git a/tier-1/passwd b/tier-1/passwd
deleted file mode 120000
index dc62c0b..0000000
--- a/tier-1/passwd
+++ /dev/null
@@ -1 +0,0 @@
-../tier-0/passwd
\ No newline at end of file