diff --git a/osbuild-manifests/Makefile b/osbuild-manifests/Makefile
index b033f0f..3efaa92 100644
--- a/osbuild-manifests/Makefile
+++ b/osbuild-manifests/Makefile
@@ -11,7 +11,7 @@ apply-escaped-space = $(subst $(ESCAPEDSPACE_REPLACEMENT),$(SPACE),$1)
 
 HOST_ARCH:=$(shell arch)
 
-ARCHES := x86_64 aarch64
+ARCHES := x86_64
 
 
 export VM=0
@@ -40,7 +40,6 @@ endif
 export CHECKPOINTS=build
 IMAGETYPES := regular ostree direct
 FORMATS := img qcow2 oci.tar repo rootfs ext4 tar
-aarch64_TARGETS := rpi4
 COMMON_TARGETS := qemu
 HOST_TARGETS := $(COMMON_TARGETS) $($(HOST_ARCH)_TARGETS)
 ALL_TARGETS := $(COMMON_TARGETS) $(foreach a,$(ARCHES), $($(a)_TARGETS))
diff --git a/osbuild-manifests/hosting/edge.ks b/osbuild-manifests/hosting/edge.ks
index b4b71d5..1d43389 100644
--- a/osbuild-manifests/hosting/edge.ks
+++ b/osbuild-manifests/hosting/edge.ks
@@ -5,6 +5,7 @@ timezone Etc/UTC --utc
 text
 
 ostreesetup --nogpg --osname=centos --remote=edge --url=http://192.168.1.107:8080/repo/ --ref=c9s/x86_64/edge
+autopart --nohome --fstype=ext4 --type=plain
 
 rootpw --lock
 
diff --git a/osbuild-manifests/include/build-aarch64.ipp.yml b/osbuild-manifests/include/build-aarch64.ipp.yml
deleted file mode 100644
index b0ef9eb..0000000
--- a/osbuild-manifests/include/build-aarch64.ipp.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-version: '2'
-mpp-vars:
-  efiarch: aa64
-  boot_rpms:
-    mpp-join:
-      - mpp-eval: boot_rpms
-      - - grub2-efi-aa64
-  base_rpms:
-    mpp-join:
-      - mpp-eval: base_rpms
-      - []
-pipelines:
-- name: build
-  runner: org.osbuild.centos9
-  stages:
-  - type: org.osbuild.rpm
-    inputs:
-      packages:
-        type: org.osbuild.files
-        origin: org.osbuild.source
-        mpp-depsolve:
-          architecture: $arch
-          module-platform-id: $distro_module_id
-          baseurl: $distro_baseurl/BaseOS/$arch/os/
-          repos:
-            mpp-eval: distro_repos
-          packages:
-            mpp-join:
-              - mpp-eval: build_rpms
-              - mpp-eval: extra_build_rpms
-              - - grub2-efi-aa64
-                - grub2-efi-aa64-cdboot
-                - shim-aa64
-    options:
-      gpgkeys:
-      - mpp-eval: centos_gpg_key
-      - mpp-eval: redhat_gpg_key
-      exclude:
-        docs: true
-  - type: org.osbuild.selinux
-    options:
-      file_contexts: etc/selinux/targeted/contexts/files/file_contexts
-      labels:
-        /usr/bin/cp: system_u:object_r:install_exec_t:s0
-        /usr/bin/tar: system_u:object_r:install_exec_t:s0
diff --git a/osbuild-manifests/include/build-x86_64.ipp.yml b/osbuild-manifests/include/build-x86_64.ipp.yml
index 3039545..142e2c5 100644
--- a/osbuild-manifests/include/build-x86_64.ipp.yml
+++ b/osbuild-manifests/include/build-x86_64.ipp.yml
@@ -5,6 +5,7 @@ mpp-vars:
     mpp-join:
       - mpp-eval: boot_rpms
       - - grub2-efi-x64
+        - grub2-pc
   base_rpms:
     mpp-join:
       - mpp-eval: base_rpms
@@ -31,6 +32,9 @@ pipelines:
               - - grub2-efi-x64
                 - grub2-efi-x64-cdboot
                 - grub2-tools-efi
+                - grub2-pc
+                - grub2-pc-modules
+                - grub2-tools
                 - shim-x64
     options:
       gpgkeys:
diff --git a/osbuild-manifests/include/defaults.ipp.yml b/osbuild-manifests/include/defaults.ipp.yml
index c277ccf..90079ac 100644
--- a/osbuild-manifests/include/defaults.ipp.yml
+++ b/osbuild-manifests/include/defaults.ipp.yml
@@ -6,8 +6,8 @@ mpp-vars:
   default_ostree_os_version: $distro_version
   default_osname: centos
   default_uefi_vendor: centos
-  default_kernel_rpm: kernel-automotive
-  default_linux_firmware_rpm: linux-firmware-automotive
+  default_kernel_rpm: kernel
+  default_linux_firmware_rpm: linux-firmware
   default_partition_label: gpt
   default_extra_rpms: []
   default_extra_build_rpms: []
diff --git a/osbuild-manifests/include/image-ostree.ipp.yml b/osbuild-manifests/include/image-ostree.ipp.yml
index ac6579c..87fd940 100644
--- a/osbuild-manifests/include/image-ostree.ipp.yml
+++ b/osbuild-manifests/include/image-ostree.ipp.yml
@@ -12,6 +12,7 @@ mpp-vars:
       - greenboot-status
       - greenboot-rpm-ostree-grub2
       - polkit # Needed by rpm-ostree upgrade (until fix for https://github.com/coreos/rpm-ostree/issues/3554 is in)
+      - ostree-grub2
 pipelines:
 - name: ostree-tree
   build: name:build
@@ -207,8 +208,8 @@ pipelines:
       uefi:
         vendor:
           mpp-eval: uefi_vendor
-        unified: true
+        unified: false
         install: true
-      legacy: false
+      legacy: true
       write_defaults: false
       greenboot: true
diff --git a/osbuild-manifests/include/image-regular.ipp.yml b/osbuild-manifests/include/image-regular.ipp.yml
index 77dce25..8747ba8 100644
--- a/osbuild-manifests/include/image-regular.ipp.yml
+++ b/osbuild-manifests/include/image-regular.ipp.yml
@@ -67,8 +67,8 @@ pipelines:
           uefi:
             vendor:
               mpp-eval: uefi_vendor
-            unified: true
-          legacy: false
+            unified: false
+          legacy: true
           write_defaults: false
           greenboot: true
       - type: org.osbuild.fix-bls