diff --git a/cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden
index b8b8450be3..07866ea7ae 100644
--- a/cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-rdb-instance-upgrade-usage.golden
@@ -10,6 +10,7 @@ ARGS:
   [node-type]       Node type of the instance you want to upgrade to (DB-DEV-S | DB-DEV-M | DB-DEV-L | DB-DEV-XL | DB-GP-XS | DB-GP-S | DB-GP-M | DB-GP-L | DB-GP-XL)
   [enable-ha]       Set to true to enable high availability on your instance
   [volume-size]     Increase your block storage volume size
+  [volume-type]     Change your instance storage type (lssd | bssd)
   [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
 FLAGS:
diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-create-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-snapshot-create-usage.golden
new file mode 100644
index 0000000000..f1575ef90a
--- /dev/null
+++ b/cmd/scw/testdata/test-all-usage-rdb-snapshot-create-usage.golden
@@ -0,0 +1,21 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Create an instance snapshot.
+
+USAGE:
+  scw rdb snapshot create [arg=value ...]
+
+ARGS:
+  instance-id        UUID of the instance
+  name=<generated>   Name of the snapshot
+  [expires-at]       Expiration date (Format ISO 8601)
+  [region=fr-par]    Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for create
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-delete-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-snapshot-delete-usage.golden
new file mode 100644
index 0000000000..892161a950
--- /dev/null
+++ b/cmd/scw/testdata/test-all-usage-rdb-snapshot-delete-usage.golden
@@ -0,0 +1,19 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Delete an instance snapshot.
+
+USAGE:
+  scw rdb snapshot delete <snapshot-id ...> [arg=value ...]
+
+ARGS:
+  snapshot-id       UUID of the snapshot to delete
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for delete
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-get-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-snapshot-get-usage.golden
new file mode 100644
index 0000000000..f3deea1556
--- /dev/null
+++ b/cmd/scw/testdata/test-all-usage-rdb-snapshot-get-usage.golden
@@ -0,0 +1,19 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Get an instance snapshot.
+
+USAGE:
+  scw rdb snapshot get <snapshot-id ...> [arg=value ...]
+
+ARGS:
+  snapshot-id       UUID of the snapshot
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for get
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-list-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-snapshot-list-usage.golden
new file mode 100644
index 0000000000..db13b6ba57
--- /dev/null
+++ b/cmd/scw/testdata/test-all-usage-rdb-snapshot-list-usage.golden
@@ -0,0 +1,23 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+List instance snapshots.
+
+USAGE:
+  scw rdb snapshot list [arg=value ...]
+
+ARGS:
+  [name]              Name of the snapshot
+  [order-by]          Criteria to use when ordering snapshot listing (created_at_asc | created_at_desc | name_asc | name_desc | expires_at_asc | expires_at_desc)
+  [instance-id]       UUID of the instance
+  [project-id]        Project ID the snapshots belongs to
+  [organization-id]   Organization ID the snapshots belongs to
+  [region=fr-par]     Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for list
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-restore-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-snapshot-restore-usage.golden
new file mode 100644
index 0000000000..a1a95ab5c1
--- /dev/null
+++ b/cmd/scw/testdata/test-all-usage-rdb-snapshot-restore-usage.golden
@@ -0,0 +1,22 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Create a new instance from a given snapshot.
+
+USAGE:
+  scw rdb snapshot restore <snapshot-id ...> [arg=value ...]
+
+ARGS:
+  snapshot-id       Block snapshot of the instance
+  [instance-name]   Name of the instance created with the snapshot
+  [is-ha-cluster]   Whether or not High-Availability is enabled on the new instance
+  [node-type]       The node type used to restore the snapshot
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for restore
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-update-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-snapshot-update-usage.golden
new file mode 100644
index 0000000000..7532f69f96
--- /dev/null
+++ b/cmd/scw/testdata/test-all-usage-rdb-snapshot-update-usage.golden
@@ -0,0 +1,21 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Update an instance snapshot.
+
+USAGE:
+  scw rdb snapshot update <snapshot-id ...> [arg=value ...]
+
+ARGS:
+  snapshot-id       UUID of the snapshot to update
+  [name]            Name of the snapshot
+  [expires-at]      Expiration date (Format ISO 8601)
+  [region=fr-par]   Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+
+FLAGS:
+  -h, --help   help for update
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
diff --git a/cmd/scw/testdata/test-all-usage-rdb-snapshot-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-snapshot-usage.golden
new file mode 100644
index 0000000000..fbefc7d308
--- /dev/null
+++ b/cmd/scw/testdata/test-all-usage-rdb-snapshot-usage.golden
@@ -0,0 +1,25 @@
+🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
+🟥🟥🟥 STDERR️️ 🟥🟥🟥️
+Create, restore and manage block snapshot
+
+USAGE:
+  scw rdb snapshot <command>
+
+AVAILABLE COMMANDS:
+  create      Create an instance snapshot
+  delete      Delete an instance snapshot
+  get         Get an instance snapshot
+  list        List instance snapshots
+  restore     Create a new instance from a given snapshot
+  update      Update an instance snapshot
+
+FLAGS:
+  -h, --help   help for snapshot
+
+GLOBAL FLAGS:
+  -c, --config string    The path to the config file
+  -D, --debug            Enable debug mode
+  -o, --output string    Output format: json or human, see 'scw help output' for more info (default "human")
+  -p, --profile string   The config profile to use
+
+Use "scw rdb snapshot [command] --help" for more information about a command.
diff --git a/cmd/scw/testdata/test-all-usage-rdb-usage.golden b/cmd/scw/testdata/test-all-usage-rdb-usage.golden
index 9719360f63..bbf10bae91 100644
--- a/cmd/scw/testdata/test-all-usage-rdb-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-rdb-usage.golden
@@ -14,6 +14,7 @@ AVAILABLE COMMANDS:
   log         Instance logs management commands
   node-type   Node types management commands
   privilege   User privileges management commands
+  snapshot    Block snapshot management
   user        User management commands
 
 FLAGS:
diff --git a/internal/namespaces/rdb/v1/rdb_cli.go b/internal/namespaces/rdb/v1/rdb_cli.go
index a81e200913..230225418e 100644
--- a/internal/namespaces/rdb/v1/rdb_cli.go
+++ b/internal/namespaces/rdb/v1/rdb_cli.go
@@ -29,6 +29,7 @@ func GetGeneratedCommands() *core.Commands {
 		rdbDatabase(),
 		rdbNodeType(),
 		rdbLog(),
+		rdbSnapshot(),
 		rdbEngineList(),
 		rdbNodeTypeList(),
 		rdbBackupList(),
@@ -61,6 +62,12 @@ func GetGeneratedCommands() *core.Commands {
 		rdbDatabaseDelete(),
 		rdbPrivilegeList(),
 		rdbPrivilegeSet(),
+		rdbSnapshotList(),
+		rdbSnapshotGet(),
+		rdbSnapshotCreate(),
+		rdbSnapshotUpdate(),
+		rdbSnapshotDelete(),
+		rdbSnapshotRestore(),
 	)
 }
 func rdbRoot() *core.Command {
@@ -160,6 +167,16 @@ func rdbLog() *core.Command {
 	}
 }
 
+func rdbSnapshot() *core.Command {
+	return &core.Command{
+		Short: `Block snapshot management`,
+		Long: `Create, restore and manage block snapshot
+`,
+		Namespace: "rdb",
+		Resource:  "snapshot",
+	}
+}
+
 func rdbEngineList() *core.Command {
 	return &core.Command{
 		Short:     `List available database engines`,
@@ -552,6 +569,14 @@ func rdbInstanceUpgrade() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "volume-type",
+				Short:      `Change your instance storage type`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{"lssd", "bssd"},
+			},
 			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
 		},
 		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
@@ -1637,3 +1662,266 @@ func rdbPrivilegeSet() *core.Command {
 		},
 	}
 }
+
+func rdbSnapshotList() *core.Command {
+	return &core.Command{
+		Short:     `List instance snapshots`,
+		Long:      `List instance snapshots.`,
+		Namespace: "rdb",
+		Resource:  "snapshot",
+		Verb:      "list",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(rdb.ListSnapshotsRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "name",
+				Short:      `Name of the snapshot`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "order-by",
+				Short:      `Criteria to use when ordering snapshot listing`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+				EnumValues: []string{"created_at_asc", "created_at_desc", "name_asc", "name_desc", "expires_at_asc", "expires_at_desc"},
+			},
+			{
+				Name:       "instance-id",
+				Short:      `UUID of the instance`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "project-id",
+				Short:      `Project ID the snapshots belongs to`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "organization-id",
+				Short:      `Organization ID the snapshots belongs to`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*rdb.ListSnapshotsRequest)
+
+			client := core.ExtractClient(ctx)
+			api := rdb.NewAPI(client)
+			resp, err := api.ListSnapshots(request, scw.WithAllPages())
+			if err != nil {
+				return nil, err
+			}
+			return resp.Snapshots, nil
+
+		},
+	}
+}
+
+func rdbSnapshotGet() *core.Command {
+	return &core.Command{
+		Short:     `Get an instance snapshot`,
+		Long:      `Get an instance snapshot.`,
+		Namespace: "rdb",
+		Resource:  "snapshot",
+		Verb:      "get",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(rdb.GetSnapshotRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "snapshot-id",
+				Short:      `UUID of the snapshot`,
+				Required:   true,
+				Deprecated: false,
+				Positional: true,
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*rdb.GetSnapshotRequest)
+
+			client := core.ExtractClient(ctx)
+			api := rdb.NewAPI(client)
+			return api.GetSnapshot(request)
+
+		},
+	}
+}
+
+func rdbSnapshotCreate() *core.Command {
+	return &core.Command{
+		Short:     `Create an instance snapshot`,
+		Long:      `Create an instance snapshot.`,
+		Namespace: "rdb",
+		Resource:  "snapshot",
+		Verb:      "create",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(rdb.CreateSnapshotRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "instance-id",
+				Short:      `UUID of the instance`,
+				Required:   true,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "name",
+				Short:      `Name of the snapshot`,
+				Required:   true,
+				Deprecated: false,
+				Positional: false,
+				Default:    core.RandomValueGenerator("snp"),
+			},
+			{
+				Name:       "expires-at",
+				Short:      `Expiration date (Format ISO 8601)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*rdb.CreateSnapshotRequest)
+
+			client := core.ExtractClient(ctx)
+			api := rdb.NewAPI(client)
+			return api.CreateSnapshot(request)
+
+		},
+	}
+}
+
+func rdbSnapshotUpdate() *core.Command {
+	return &core.Command{
+		Short:     `Update an instance snapshot`,
+		Long:      `Update an instance snapshot.`,
+		Namespace: "rdb",
+		Resource:  "snapshot",
+		Verb:      "update",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(rdb.UpdateSnapshotRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "snapshot-id",
+				Short:      `UUID of the snapshot to update`,
+				Required:   true,
+				Deprecated: false,
+				Positional: true,
+			},
+			{
+				Name:       "name",
+				Short:      `Name of the snapshot`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "expires-at",
+				Short:      `Expiration date (Format ISO 8601)`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*rdb.UpdateSnapshotRequest)
+
+			client := core.ExtractClient(ctx)
+			api := rdb.NewAPI(client)
+			return api.UpdateSnapshot(request)
+
+		},
+	}
+}
+
+func rdbSnapshotDelete() *core.Command {
+	return &core.Command{
+		Short:     `Delete an instance snapshot`,
+		Long:      `Delete an instance snapshot.`,
+		Namespace: "rdb",
+		Resource:  "snapshot",
+		Verb:      "delete",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(rdb.DeleteSnapshotRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "snapshot-id",
+				Short:      `UUID of the snapshot to delete`,
+				Required:   true,
+				Deprecated: false,
+				Positional: true,
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*rdb.DeleteSnapshotRequest)
+
+			client := core.ExtractClient(ctx)
+			api := rdb.NewAPI(client)
+			return api.DeleteSnapshot(request)
+
+		},
+	}
+}
+
+func rdbSnapshotRestore() *core.Command {
+	return &core.Command{
+		Short:     `Create a new instance from a given snapshot`,
+		Long:      `Create a new instance from a given snapshot.`,
+		Namespace: "rdb",
+		Resource:  "snapshot",
+		Verb:      "restore",
+		// Deprecated:    false,
+		ArgsType: reflect.TypeOf(rdb.CreateInstanceFromSnapshotRequest{}),
+		ArgSpecs: core.ArgSpecs{
+			{
+				Name:       "snapshot-id",
+				Short:      `Block snapshot of the instance`,
+				Required:   true,
+				Deprecated: false,
+				Positional: true,
+			},
+			{
+				Name:       "instance-name",
+				Short:      `Name of the instance created with the snapshot`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "is-ha-cluster",
+				Short:      `Whether or not High-Availability is enabled on the new instance`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			{
+				Name:       "node-type",
+				Short:      `The node type used to restore the snapshot`,
+				Required:   false,
+				Deprecated: false,
+				Positional: false,
+			},
+			core.RegionArgSpec(scw.RegionFrPar, scw.RegionNlAms, scw.RegionPlWaw),
+		},
+		Run: func(ctx context.Context, args interface{}) (i interface{}, e error) {
+			request := args.(*rdb.CreateInstanceFromSnapshotRequest)
+
+			client := core.ExtractClient(ctx)
+			api := rdb.NewAPI(client)
+			return api.CreateInstanceFromSnapshot(request)
+
+		},
+	}
+}