diff --git a/blivet/devices/partition.py b/blivet/devices/partition.py
index cfb287415..7667e7ce4 100644
--- a/blivet/devices/partition.py
+++ b/blivet/devices/partition.py
@@ -454,24 +454,19 @@ def _get_weight(self):
 
         # now we have the weights for varying mountpoints and fstypes by platform
         weight = 0
+
         if self.format.mountable and self.format.mountpoint == "/boot":
             weight = 2000
         elif (self.format.mountable and
               self.format.mountpoint == "/boot/efi" and
-              self.format.type in ("efi", "macefi") and
-              arch.is_efi()):
+              self.format.type in ("efi", "macefi")):
             weight = 5000
-        elif arch.is_x86() and self.format.type == "biosboot" and not arch.is_efi():
+        elif self.format.type in ("biosboot", "appleboot", "prepboot"):
             weight = 5000
         elif self.format.mountable and arch.is_arm():
             # On ARM images '/' must be the last partition.
             if self.format.mountpoint == "/":
                 weight = -100
-        elif arch.is_ppc():
-            if arch.is_pmac() and self.format.type == "appleboot":
-                weight = 5000
-            elif arch.is_ipseries() and self.format.type == "prepboot":
-                weight = 5000
 
         return weight