diff --git a/pkg/cli/cmds/etcd_snapshot.go b/pkg/cli/cmds/etcd_snapshot.go
index 387031224d..679d76276b 100644
--- a/pkg/cli/cmds/etcd_snapshot.go
+++ b/pkg/cli/cmds/etcd_snapshot.go
@@ -21,24 +21,26 @@ func NewEtcdSnapshotCommand() cli.Command {
 			Usage:   "(data) Folder to hold state",
 			Default: rke2Path,
 		},
-		"server": {
+		"etcd-server": {
 			Default: "https://127.0.0.1:9345",
 		},
-		"token":              copyFlag,
+		"etcd-token":         copyFlag,
 		"name":               copyFlag,
 		"dir":                copyFlag,
 		"snapshot-compress":  copyFlag,
 		"snapshot-retention": copyFlag,
 		"s3":                 copyFlag,
-		"s3-endpoint":        copyFlag,
-		"s3-endpoint-ca":     copyFlag,
-		"s3-skip-ssl-verify": copyFlag,
 		"s3-access-key":      copyFlag,
-		"s3-secret-key":      copyFlag,
 		"s3-bucket":          copyFlag,
-		"s3-region":          copyFlag,
+		"s3-config-secret":   copyFlag,
+		"s3-endpoint":        copyFlag,
+		"s3-endpoint-ca":     copyFlag,
 		"s3-folder":          copyFlag,
 		"s3-insecure":        copyFlag,
+		"s3-proxy":           copyFlag,
+		"s3-region":          copyFlag,
+		"s3-secret-key":      copyFlag,
+		"s3-skip-ssl-verify": copyFlag,
 		"s3-timeout":         copyFlag,
 	}
 	subcommandOpts := map[string]K3SFlagSet{
diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
index e9b0bce8dc..003e8d6990 100644
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -130,15 +130,17 @@ var (
 		"etcd-expose-metrics":               copyFlag,
 		"airgap-extra-registry":             copyFlag,
 		"etcd-s3":                           copyFlag,
-		"etcd-s3-endpoint":                  copyFlag,
-		"etcd-s3-endpoint-ca":               copyFlag,
-		"etcd-s3-skip-ssl-verify":           copyFlag,
 		"etcd-s3-access-key":                copyFlag,
-		"etcd-s3-secret-key":                copyFlag,
 		"etcd-s3-bucket":                    copyFlag,
-		"etcd-s3-region":                    copyFlag,
+		"etcd-s3-config-secret":             copyFlag,
+		"etcd-s3-endpoint":                  copyFlag,
+		"etcd-s3-endpoint-ca":               copyFlag,
 		"etcd-s3-folder":                    copyFlag,
 		"etcd-s3-insecure":                  copyFlag,
+		"etcd-s3-proxy":                     copyFlag,
+		"etcd-s3-region":                    copyFlag,
+		"etcd-s3-secret-key":                copyFlag,
+		"etcd-s3-skip-ssl-verify":           copyFlag,
 		"etcd-s3-timeout":                   copyFlag,
 		"disable-helm-controller":           dropFlag,
 		"helm-job-image":                    copyFlag,