diff --git a/bisect-linux-boot-gem5 b/bisect-linux-boot-gem5
index c204fac..6d9a43c 100755
--- a/bisect-linux-boot-gem5
+++ b/bisect-linux-boot-gem5
@@ -16,7 +16,7 @@ parser = self.get_argparse(
 More information at: https://github.com/cirosantilli/linux-kernel-module-cheat#bisection
 '''},
     default_args={
-        'gem5': True,
+        'emulators': ['gem5'],
         'linux_build_id': 'bisect',
     },
 )
diff --git a/config.py b/config.py
index b7ad4ad..9f0a606 100644
--- a/config.py
+++ b/config.py
@@ -1,6 +1,6 @@
 def set_args(args, script_name):
     args['arch'] = 'aarch64'
-    args['gem5'] = True
+    args['emulators'] = ['gem5']
     if script_name == 'build-gem5':
         # This argument is defined only for ./build-gem5.
         args['extra_scons_args'] = ['ADSF=qwer']
diff --git a/gem5-shell b/gem5-shell
index 58977ed..cca743e 100755
--- a/gem5-shell
+++ b/gem5-shell
@@ -7,7 +7,7 @@ class Main(common.LkmcCliFunction):
     def __init__(self):
         super().__init__(
             defaults={
-                'gem5': True,
+                'emulators': ['gem5'],
             },
             description='Connect a terminal to a running gem5 instance',
         )