diff --git a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
index 960f443..8c128dc 100644
--- a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
+++ b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
@@ -42,8 +42,9 @@ class EfiFinalizationFix(Actor):
         }
 
         def devparts(dev):
-          part = next(re.finditer(r'\d+$', dev)).group(0)
+          part = next(re.finditer(r'p?\d+$', dev)).group(0)
           dev = dev[:-len(part)]
+          part = next(re.finditer(r'\d+$', part)).group(0)
           return [dev, part];
 
         with open('/etc/system-release', 'r') as sr: