diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
index c1b724cbf3..2c3c28df70 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-create-usage.golden
@@ -13,6 +13,7 @@ EXAMPLES:
     scw baremetal server create name=foo tags.0=prod tags.1=blue type=GP-BM1-M
 
 ARGS:
+  [project-id]                    Project ID with which the server will be created
   name=<generated>                Name of the server (≠hostname)
   [description]                   Description associated to the server, max 255 characters
   [type=GP-BM1-S]                 Server commercial type (GP-BM1-L | GP-BM1-M | GP-BM1-S | HC-BM1-L | HC-BM1-S | HM-BM1-XL | HM-BM1-M)
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden
index a627379bd8..9e1d1b07c6 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-list-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-List baremetal servers.
+List baremetal servers for organization.
 
 USAGE:
   scw baremetal server list [arg=value ...]
@@ -14,6 +14,7 @@ ARGS:
   [tags.{index}]      Filter servers by tags
   [status.{index}]    Filter servers by status
   [name]              Filter servers by name
+  [project-id]        Filter servers by project ID
   [organization-id]   Filter servers by organization ID
   [zone=fr-par-1]     Zone to target. If none is passed will use default zone from the config (fr-par-2)
 
diff --git a/cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden b/cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden
index c8c7119ce1..62fec5bf8c 100644
--- a/cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-baremetal-server-usage.golden
@@ -10,7 +10,7 @@ AVAILABLE COMMANDS:
   delete      Delete a baremetal server
   get         Get a specific baremetal server
   install     Install a baremetal server
-  list        List baremetal servers
+  list        List baremetal servers for organization
   reboot      Reboot a baremetal server
   start       Start a baremetal server
   stop        Stop a baremetal server
diff --git a/internal/namespaces/baremetal/v1/baremetal_cli.go b/internal/namespaces/baremetal/v1/baremetal_cli.go
index c11502be46..f2ab9a1755 100644
--- a/internal/namespaces/baremetal/v1/baremetal_cli.go
+++ b/internal/namespaces/baremetal/v1/baremetal_cli.go
@@ -78,8 +78,8 @@ For instance, your KVM-IP management console could be accessed with it.
 
 func baremetalServerList() *core.Command {
 	return &core.Command{
-		Short:     `List baremetal servers`,
-		Long:      `List baremetal servers.`,
+		Short:     `List baremetal servers for organization`,
+		Long:      `List baremetal servers for organization.`,
 		Namespace: "baremetal",
 		Resource:  "server",
 		Verb:      "list",
@@ -110,6 +110,12 @@ func baremetalServerList() *core.Command {
 				Required:   false,
 				Positional: false,
 			},
+			{
+				Name:       "project-id",
+				Short:      `Filter servers by project ID`,
+				Required:   false,
+				Positional: false,
+			},
 			{
 				Name:       "organization-id",
 				Short:      `Filter servers by organization ID`,
@@ -188,6 +194,12 @@ func baremetalServerCreate() *core.Command {
 				Required:   true,
 				Positional: false,
 			},
+			{
+				Name:       "project-id",
+				Short:      `Project ID with which the server will be created`,
+				Required:   false,
+				Positional: false,
+			},
 			{
 				Name:       "name",
 				Short:      `Name of the server (≠hostname)`,