diff --git a/pkg/sentry/seccheck/metadata_amd64.go b/pkg/sentry/seccheck/metadata_amd64.go
index a3004e8a2..a4bcc4015 100644
--- a/pkg/sentry/seccheck/metadata_amd64.go
+++ b/pkg/sentry/seccheck/metadata_amd64.go
@@ -17,6 +17,8 @@
 
 package seccheck
 
+// init registers syscall trace points metadata.
+// Keep them sorted by syscall number.
 func init() {
 	addSyscallPoint(0, "read", []FieldDesc{
 		{
@@ -61,77 +63,7 @@ func init() {
 			Name: "fd_path",
 		},
 	})
-	addSyscallPoint(41, "socket", nil)
-	addSyscallPoint(42, "connect", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(59, "execve", []FieldDesc{
-		{
-			ID:   FieldSyscallExecveEnvv,
-			Name: "envv",
-		},
-	})
-	addSyscallPoint(85, "creat", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(257, "openat", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(322, "execveat", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-		{
-			ID:   FieldSyscallExecveEnvv,
-			Name: "envv",
-		},
-	})
-	addSyscallPoint(80, "chdir", nil)
-	addSyscallPoint(81, "fchdir", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
 	addSyscallPoint(22, "pipe", nil)
-	addSyscallPoint(293, "pipe2", nil)
-	addSyscallPoint(72, "fcntl", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(105, "setuid", nil)
-	addSyscallPoint(106, "setgid", nil)
-	addSyscallPoint(112, "setsid", nil)
-	addSyscallPoint(117, "setresuid", nil)
-	addSyscallPoint(119, "setresgid", nil)
-	addSyscallPoint(161, "chroot", nil)
-	addSyscallPoint(302, "prlimit64", nil)
-	addSyscallPoint(284, "eventfd", nil)
-	addSyscallPoint(290, "eventfd2", nil)
-	addSyscallPoint(282, "signalfd", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(289, "signalfd4", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
 	addSyscallPoint(32, "dup", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
@@ -144,14 +76,8 @@ func init() {
 			Name: "fd_path",
 		},
 	})
-	addSyscallPoint(292, "dup3", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(56, "clone", nil)
-	addSyscallPoint(49, "bind", []FieldDesc{
+	addSyscallPoint(41, "socket", nil)
+	addSyscallPoint(42, "connect", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
 			Name: "fd_path",
@@ -163,16 +89,48 @@ func init() {
 			Name: "fd_path",
 		},
 	})
-	addSyscallPoint(288, "accept4", []FieldDesc{
+	addSyscallPoint(49, "bind", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
 			Name: "fd_path",
 		},
 	})
+	addSyscallPoint(53, "socketpair", nil)
+	addSyscallPoint(56, "clone", nil)
 	addSyscallPoint(57, "fork", nil)
 	addSyscallPoint(58, "vfork", nil)
+	addSyscallPoint(59, "execve", []FieldDesc{
+		{
+			ID:   FieldSyscallExecveEnvv,
+			Name: "envv",
+		},
+	})
+	addSyscallPoint(72, "fcntl", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(85, "creat", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(80, "chdir", nil)
+	addSyscallPoint(81, "fchdir", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(105, "setuid", nil)
+	addSyscallPoint(106, "setgid", nil)
+	addSyscallPoint(112, "setsid", nil)
+	addSyscallPoint(117, "setresuid", nil)
+	addSyscallPoint(119, "setresgid", nil)
+	addSyscallPoint(161, "chroot", nil)
 	addSyscallPoint(253, "inotify_init", nil)
-	addSyscallPoint(294, "inotify_init1", nil)
 	addSyscallPoint(254, "inotify_add_watch", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
@@ -185,7 +143,20 @@ func init() {
 			Name: "fd_path",
 		},
 	})
+	addSyscallPoint(257, "openat", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(282, "signalfd", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
 	addSyscallPoint(283, "timerfd_create", nil)
+	addSyscallPoint(284, "eventfd", nil)
 	addSyscallPoint(286, "timerfd_settime", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
@@ -198,7 +169,27 @@ func init() {
 			Name: "fd_path",
 		},
 	})
-	addSyscallPoint(53, "socketpair", nil)
+	addSyscallPoint(288, "accept4", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(289, "signalfd4", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(290, "eventfd2", nil)
+	addSyscallPoint(292, "dup3", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(293, "pipe2", nil)
+	addSyscallPoint(294, "inotify_init1", nil)
 	addSyscallPoint(295, "preadv", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
@@ -211,6 +202,17 @@ func init() {
 			Name: "fd_path",
 		},
 	})
+	addSyscallPoint(302, "prlimit64", nil)
+	addSyscallPoint(322, "execveat", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+		{
+			ID:   FieldSyscallExecveEnvv,
+			Name: "envv",
+		},
+	})
 	addSyscallPoint(327, "preadv2", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
diff --git a/pkg/sentry/seccheck/metadata_arm64.go b/pkg/sentry/seccheck/metadata_arm64.go
index 1a00eb304..0e349dd93 100644
--- a/pkg/sentry/seccheck/metadata_arm64.go
+++ b/pkg/sentry/seccheck/metadata_arm64.go
@@ -17,7 +17,63 @@
 
 package seccheck
 
+// init registers syscall trace points metadata.
+// Keep them sorted by syscall number.
 func init() {
+	addSyscallPoint(19, "eventfd2", nil)
+	addSyscallPoint(23, "dup", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(24, "dup3", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(25, "fcntl", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+
+	addSyscallPoint(26, "inotify_init1", nil)
+	addSyscallPoint(27, "inotify_add_watch", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(28, "inotify_rm_watch", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(49, "chdir", nil)
+	addSyscallPoint(50, "fchdir", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(51, "chroot", nil)
+	addSyscallPoint(56, "openat", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(57, "close", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(59, "pipe2", nil)
 	addSyscallPoint(63, "read", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
@@ -66,113 +122,12 @@ func init() {
 			Name: "fd_path",
 		},
 	})
-	addSyscallPoint(57, "close", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(198, "socket", nil)
-	addSyscallPoint(203, "connect", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(221, "execve", []FieldDesc{
-		{
-			ID:   FieldSyscallExecveEnvv,
-			Name: "envv",
-		},
-	})
-	addSyscallPoint(56, "openat", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(281, "execveat", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-		{
-			ID:   FieldSyscallExecveEnvv,
-			Name: "envv",
-		},
-	})
-	addSyscallPoint(49, "chdir", nil)
-	addSyscallPoint(50, "fchdir", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(146, "setuid", nil)
-	addSyscallPoint(144, "setgid", nil)
-	addSyscallPoint(157, "setsid", nil)
-	addSyscallPoint(147, "setresuid", nil)
-	addSyscallPoint(149, "setresgid", nil)
-	addSyscallPoint(261, "prlimit64", nil)
-	addSyscallPoint(51, "chroot", nil)
-	addSyscallPoint(23, "dup", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(24, "dup3", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(59, "pipe2", nil)
 	addSyscallPoint(74, "signalfd4", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,
 			Name: "fd_path",
 		},
 	})
-	addSyscallPoint(25, "fcntl", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(19, "eventfd2", nil)
-	addSyscallPoint(220, "clone", nil)
-	addSyscallPoint(200, "bind", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(202, "accept", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(242, "accept4", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(26, "inotify_init1", nil)
-	addSyscallPoint(27, "inotify_add_watch", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
-	addSyscallPoint(28, "inotify_rm_watch", []FieldDesc{
-		{
-			ID:   FieldSyscallPath,
-			Name: "fd_path",
-		},
-	})
 	addSyscallPoint(85, "timerfd_create", nil)
 	addSyscallPoint(86, "timerfd_settime", []FieldDesc{
 		{
@@ -186,7 +141,55 @@ func init() {
 			Name: "fd_path",
 		},
 	})
+	addSyscallPoint(144, "setgid", nil)
+	addSyscallPoint(146, "setuid", nil)
+	addSyscallPoint(147, "setresuid", nil)
+	addSyscallPoint(149, "setresgid", nil)
+	addSyscallPoint(157, "setsid", nil)
+	addSyscallPoint(198, "socket", nil)
 	addSyscallPoint(199, "socketpair", nil)
+	addSyscallPoint(200, "bind", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(202, "accept", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(203, "connect", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(220, "clone", nil)
+	addSyscallPoint(221, "execve", []FieldDesc{
+		{
+			ID:   FieldSyscallExecveEnvv,
+			Name: "envv",
+		},
+	})
+	addSyscallPoint(242, "accept4", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+	})
+	addSyscallPoint(261, "prlimit64", nil)
+	addSyscallPoint(281, "execveat", []FieldDesc{
+		{
+			ID:   FieldSyscallPath,
+			Name: "fd_path",
+		},
+		{
+			ID:   FieldSyscallExecveEnvv,
+			Name: "envv",
+		},
+	})
 	addSyscallPoint(286, "preadv2", []FieldDesc{
 		{
 			ID:   FieldSyscallPath,