diff --git a/src/cli/default.cfg b/src/cli/default.cfg
index 18d65715..401cd76a 100644
--- a/src/cli/default.cfg
+++ b/src/cli/default.cfg
@@ -112,7 +112,7 @@ rft_dev_mode = 0
 ; support_nuitka = 0
 
 ;; Group device flag for machine id
-group_device_flag = 18
+group_device_flag = 21
 
 ;;
 ;; Part 2: global/local/module level options
diff --git a/src/cli/docker.py b/src/cli/docker.py
index 3758d74b..1b811ba2 100644
--- a/src/cli/docker.py
+++ b/src/cli/docker.py
@@ -90,7 +90,7 @@ def main_entry():
     register_pyarmor(ctx, args.regfile[0])
     CONFIG['ctx'] = ctx
 
-    mflags = 20, 18, 16, 11, 10
+    mflags = 21, 20, 18, 16, 11, 10
     CONFIG['machid'] = [Pytransform3.get_hd_info(x) for x in mflags]
     logging.debug('machine id: %s', CONFIG['machid'])
 
diff --git a/src/cli/register.py b/src/cli/register.py
index 42138d69..6df786a5 100644
--- a/src/cli/register.py
+++ b/src/cli/register.py
@@ -155,7 +155,7 @@ def register_regfile(self, regfile, clean=True):
             if 'group.tokens' in namelist:
                 logger.debug('group license for machines: %s',
                              [x for x in namelist if x.startswith('tokens')])
-                for idver in (18, 20, 16, 11):
+                for idver in (21, 18, 20, 16, 11):
                     machid = self._get_machine_id(idver).decode('utf-8')
                     logger.debug('got machine id: %s', machid)
                     name = '/'.join(['tokens', machid])
@@ -217,7 +217,7 @@ def generate_group_device(self, devid):
         logger.info('generating device file "%s"', path)
         os.makedirs(os.path.dirname(path), exist_ok=True)
         uinfo = uname()
-        devflag = self.ctx.cfg['builder'].getint('group_device_flag', 18)
+        devflag = self.ctx.cfg['builder'].getint('group_device_flag', 21)
         machid = self._get_machine_id(devflag).decode('utf-8')
         logger.debug('current machine id is "%s"', machid)
         tpl = Template('\n'.join([