diff --git a/build/Makefile b/build/Makefile
index 0c43b43..e35eb7c 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,5 +1,5 @@
-RELEASE_VER_MAJOR = 8
-RELEASE_VER_MINOR = 7
+RELEASE_VER_MAJOR = 9
+RELEASE_VER_MINOR = 2
 ARCH = $(shell uname -m)
 RELEASE_NAME = rocky-linux-ostree-$(ARCH)-$(RELEASE_VER_MAJOR).$(RELEASE_VER_MINOR)
 DEFAULT_OSTREE_REMOTE = https://dl.rockylinux.org/pub/sig/$(RELEASE_VER_MAJOR)/ostree/$(ARCH)/standard/
@@ -26,7 +26,7 @@ mirror: init
 
 .PHONY: tree
 tree:
-	rpm-ostree compose tree --repo=./repo --cachedir=./cache --unified-core ../manifest.8-minimal.yaml && \
+	rpm-ostree compose tree --repo=./repo --cachedir=./cache --unified-core ../manifest.9-minimal.yaml && \
 	ostree summary --repo=./repo --update
 
 .PHONY: iso
diff --git a/kickstarts/rockylinux-8-x86_64-minimal-devel.ks b/kickstarts/rockylinux-9-x86_64-minimal-devel.ks
similarity index 56%
rename from kickstarts/rockylinux-8-x86_64-minimal-devel.ks
rename to kickstarts/rockylinux-9-x86_64-minimal-devel.ks
index 340e2a5..f8af32f 100644
--- a/kickstarts/rockylinux-8-x86_64-minimal-devel.ks
+++ b/kickstarts/rockylinux-9-x86_64-minimal-devel.ks
@@ -1,6 +1,6 @@
-ostreesetup --nogpg --osname=rockylinux --remote=rockylinux --url=https://dl.rockylinux.org/pub/sig/8/ostree/x86_64/standard/ --ref=rockylinux/8/x86_64/minimal/devel
+ostreesetup --nogpg --osname=rockylinux --remote=rockylinux --url=https://dl.rockylinux.org/pub/sig/9/ostree/x86_64/standard/ --ref=rockylinux/9/x86_64/minimal/devel
 
 %post --erroronfail
 rm -f /etc/ostree/remotes.d/rockylinux.conf
-ostree remote add --no-gpg-verify rockylinux https://dl.rockylinux.org/pub/sig/8/ostree/x86_64/standard/
+ostree remote add --no-gpg-verify rockylinux https://dl.rockylinux.org/pub/sig/9/ostree/x86_64/standard/
 %end
\ No newline at end of file
diff --git a/manifest.8-minimal.yaml b/manifest.9-minimal.yaml
similarity index 90%
rename from manifest.8-minimal.yaml
rename to manifest.9-minimal.yaml
index 9caa4dc..aa4b6f3 100644
--- a/manifest.8-minimal.yaml
+++ b/manifest.9-minimal.yaml
@@ -3,7 +3,7 @@ variables:
   stream: devel
   prod: false
 
-releasever: 8
+releasever: 9
 
 repovars:
   rltype: ${rltype}
diff --git a/manifests/arch/x86_64.yaml b/manifests/arch/x86_64.yaml
index 5e05660..6e0770a 100644
--- a/manifests/arch/x86_64.yaml
+++ b/manifests/arch/x86_64.yaml
@@ -1,11 +1,11 @@
 # Anything specific to making x86_64 work
 packages:
-  - grub2-efi-ia32
+#  - grub2-efi-ia32
   - grub2-efi-x64
   - grub2-pc
   - ostree-grub2
   - efibootmgr
-  - shim-ia32
+#  - shim-ia32
   - shim-x64
   - microcode_ctl
   - mcelog
diff --git a/manifests/dnf-groups/Standard.yaml b/manifests/dnf-groups/Standard.yaml
index 2a8141d..1060ca8 100644
--- a/manifests/dnf-groups/Standard.yaml
+++ b/manifests/dnf-groups/Standard.yaml
@@ -21,7 +21,7 @@ packages:
 #  - dbus
 #  - ed
   - file
-  - iptstate
+#  - iptstate
 #  - irqbalance
 #  - kpatch
   - logrotate
diff --git a/manifests/fixes.yaml b/manifests/fixes.yaml
index f38e9be..eff4c05 100644
--- a/manifests/fixes.yaml
+++ b/manifests/fixes.yaml
@@ -27,4 +27,9 @@ postprocess:
     
     # THIS IS ONLY NEEDED FOR 8.6 AND LOWER
     # Workaround for https://github.com/coreos/rpm-ostree/pull/3623 which is not included until rpm-ostree v2022.08
-    # sed -i 's/InaccessiblePaths=/InaccessiblePaths=-/g' /usr/lib/systemd/system/rpm-ostreed.service
\ No newline at end of file
+    # sed -i 's/InaccessiblePaths=/InaccessiblePaths=-/g' /usr/lib/systemd/system/rpm-ostreed.service
+
+    # See: https://pagure.io/fork/siosm/workstation-ostree-config/c/9dc9105ddbcfe18c83bf4b0c6a75a2d3e794b385
+    # and https://github.com/coreos/rpm-ostree/issues/3270#issuecomment-995160984
+    # Remove loader directory causing issues in Anaconda in unified core mode
+    rm -rf /usr/lib/ostree-boot/loader
\ No newline at end of file