diff --git a/system/hardware/esim.py b/system/hardware/esim.py
index 54407693b3..18d84de983 100755
--- a/system/hardware/esim.py
+++ b/system/hardware/esim.py
@@ -2,33 +2,69 @@
 
 import argparse
 from openpilot.system.hardware import HARDWARE
+from openpilot.system.hardware.base import LPABase, Profile
+
+
+def sorted_profiles(lpa: LPABase) -> list[Profile]:
+  return sorted(lpa.list_profiles(), key=lambda p: p.iccid)
+
+
+def resolve_iccid(lpa: LPABase, ref: str) -> str:
+  # ref is either a 1-based index into the sorted list, or a literal iccid
+  if ref.isdigit():
+    profiles = sorted_profiles(lpa)
+    idx = int(ref) - 1
+    if not 0 <= idx < len(profiles):
+      raise SystemExit(f'no profile at index {ref} (have {len(profiles)})')
+    return profiles[idx].iccid
+  return ref
+
+
+def print_profiles(lpa: LPABase) -> None:
+  profiles = sorted_profiles(lpa)
+  print(f'\n{len(profiles)} profile{"s" if len(profiles) != 1 else ""}:')
+  for i, p in enumerate(profiles, start=1):
+    print(f'{i}. {p.iccid} (nickname: {p.nickname or "<none provided>"}) (provider: {p.provider}) - {"enabled" if p.enabled else "disabled"}')
 
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser(prog='esim.py', description='manage eSIM profiles on your comma device', epilog='comma.ai')
-  parser.add_argument('--switch', metavar='iccid', help='switch to profile')
-  parser.add_argument('--delete', metavar='iccid', help='delete profile (warning: this cannot be undone)')
-  parser.add_argument('--download', nargs=2, metavar=('qr', 'name'), help='download a profile using QR code (format: LPA:1$rsp.truphone.com$QRF-SPEEDTEST)')
-  parser.add_argument('--nickname', nargs=2, metavar=('iccid', 'name'), help='update the nickname for a profile')
+  sub = parser.add_subparsers(dest='cmd')
+
+  sub.add_parser('list', help='list profiles')
+
+  p_switch = sub.add_parser('switch', help='switch to profile')
+  p_switch.add_argument('profile', help='iccid or 1-based index from `list`')
+
+  p_delete = sub.add_parser('delete', help='delete profile (warning: this cannot be undone)')
+  p_delete.add_argument('profile', help='iccid or 1-based index from `list`')
+
+  p_download = sub.add_parser('download', help='download a profile using QR code (format: LPA:1$rsp.truphone.com$QRF-SPEEDTEST)')
+  p_download.add_argument('qr')
+  p_download.add_argument('name')
+
+  p_nickname = sub.add_parser('nickname', help='update the nickname for a profile')
+  p_nickname.add_argument('profile', help='iccid or 1-based index from `list`')
+  p_nickname.add_argument('name')
+
   args = parser.parse_args()
 
   lpa = HARDWARE.get_sim_lpa()
-  if args.switch:
-    lpa.switch_profile(args.switch)
-  elif args.delete:
-    confirm = input('are you sure you want to delete this profile? (y/N) ')
+  if args.cmd == 'switch':
+    lpa.switch_profile(resolve_iccid(lpa, args.profile))
+  elif args.cmd == 'delete':
+    iccid = resolve_iccid(lpa, args.profile)
+    confirm = input(f'are you sure you want to delete profile {iccid}? (y/N) ')
     if confirm == 'y':
-      lpa.delete_profile(args.delete)
+      lpa.delete_profile(iccid)
     else:
       print('cancelled')
       exit(0)
-  elif args.download:
-    lpa.download_profile(args.download[0], args.download[1])
-  elif args.nickname:
-    lpa.nickname_profile(args.nickname[0], args.nickname[1])
+  elif args.cmd == 'download':
+    lpa.download_profile(args.qr, args.name)
+  elif args.cmd == 'nickname':
+    lpa.nickname_profile(resolve_iccid(lpa, args.profile), args.name)
   else:
-    parser.print_help()
-    profiles = lpa.list_profiles()
-    print(f'\n{len(profiles)} profile{"s" if len(profiles) > 1 else ""}:')
-    for p in profiles:
-      print(f'- {p.iccid} (nickname: {p.nickname or "<none provided>"}) (provider: {p.provider}) - {"enabled" if p.enabled else "disabled"}')
+    if args.cmd is None:
+      parser.print_help()
+    print_profiles(lpa)