diff --git a/pkg/cli/cmds/cert.go b/pkg/cli/cmds/cert.go
index 6102a9f2377..6dfb60d6c1c 100644
--- a/pkg/cli/cmds/cert.go
+++ b/pkg/cli/cmds/cert.go
@@ -35,9 +35,20 @@ func NewCertCommand() cli.Command {
 				Default: rke2Path,
 			},
 		},
+		"check": {
+			"alsologtostderr": copyFlag,
+			"config":          copyFlag,
+			"debug":           copyFlag,
+			"log":             copyFlag,
+			"service":         copyFlag,
+			"data-dir": {
+				Usage:   "(data) Folder to hold state",
+				Default: rke2Path,
+			},
+		},
 	}
 
-	command := cmds.NewCertCommands(Rotate, cert.RotateCA)
+	command := cmds.NewCertCommands(Rotate, cert.RotateCA, cert.Check)
 	command.Usage = "Manage RKE2 certificates"
 	configfilearg.DefaultParser.ValidFlags[command.Name] = command.Flags
 	for i, subcommand := range command.Subcommands {
diff --git a/pkg/cli/cmds/etcd_snapshot.go b/pkg/cli/cmds/etcd_snapshot.go
index beba78ae2c4..387031224d1 100644
--- a/pkg/cli/cmds/etcd_snapshot.go
+++ b/pkg/cli/cmds/etcd_snapshot.go
@@ -21,6 +21,10 @@ func NewEtcdSnapshotCommand() cli.Command {
 			Usage:   "(data) Folder to hold state",
 			Default: rke2Path,
 		},
+		"server": {
+			Default: "https://127.0.0.1:9345",
+		},
+		"token":              copyFlag,
 		"name":               copyFlag,
 		"dir":                copyFlag,
 		"snapshot-compress":  copyFlag,