diff --git a/cmd/scw/testdata/test-all-usage-dedibox-bmc-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-bmc-get-usage.golden
index 5cfdf05bc..098853f1a 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-bmc-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-bmc-get-usage.golden
@@ -3,7 +3,7 @@
 Get the BMC (Baseboard Management Controller) access associated with the given ID.
 
 USAGE:
-  scw dedibox bmc get <server-id ...> [arg=value ...]
+  scw dedibox bmc get [arg=value ...]
 
 ARGS:
   server-id         ID of the server to get BMC access
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-bmc-start-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-bmc-start-usage.golden
index cbce3f1cb..b78a61c16 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-bmc-start-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-bmc-start-usage.golden
@@ -4,7 +4,7 @@ Start BMC (Baseboard Management Controller) access associated with the given ID.
 The BMC (Baseboard Management Controller) access is available one hour after the installation of the server.
 
 USAGE:
-  scw dedibox bmc start <server-id ...> [arg=value ...]
+  scw dedibox bmc start [arg=value ...]
 
 ARGS:
   server-id         ID of the server to start the BMC access
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-bmc-stop-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-bmc-stop-usage.golden
index d51a7f449..f9fcc5609 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-bmc-stop-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-bmc-stop-usage.golden
@@ -3,7 +3,7 @@
 Stop BMC (Baseboard Management Controller) access associated with the given ID.
 
 USAGE:
-  scw dedibox bmc stop <server-id ...> [arg=value ...]
+  scw dedibox bmc stop [arg=value ...]
 
 ARGS:
   server-id         ID of the server to stop BMC access
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-fip-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-fip-get-usage.golden
index 2e62466fa..8a30c7430 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-fip-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-fip-get-usage.golden
@@ -3,7 +3,7 @@
 Get the server associated with the given ID.
 
 USAGE:
-  scw dedibox fip get <ip-id ...> [arg=value ...]
+  scw dedibox fip get [arg=value ...]
 
 ARGS:
   ip-id             ID of the failover IP
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden
index 0b507c7dd..780fe1381 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-offer-get-usage.golden
@@ -3,7 +3,7 @@
 Return specific offer for the given ID.
 
 USAGE:
-  scw dedibox offer get <offer-id ...> [arg=value ...]
+  scw dedibox offer get [arg=value ...]
 
 ARGS:
   offer-id                               ID of offer
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden
index 47442194f..21f1f393b 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-os-get-usage.golden
@@ -3,7 +3,7 @@
 Return specific OS for the given ID.
 
 USAGE:
-  scw dedibox os get <os-id ...> [arg=value ...]
+  scw dedibox os get [arg=value ...]
 
 ARGS:
   os-id             ID of the OS
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden
index ba7568f2d..e09ff1672 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-os-list-usage.golden
@@ -3,12 +3,12 @@
 List all available OS that can be install on a baremetal server.
 
 USAGE:
-  scw dedibox os list <server-id ...> [arg=value ...]
+  scw dedibox os list [arg=value ...]
 
 ARGS:
   [order-by]                             Order of the OS (created_at_asc | created_at_desc | released_at_asc | released_at_desc)
   [type]                                 Type of the OS (unknown_type | server | virtu | panel | desktop | custom | rescue)
-  server-id                              Filter OS by compatible server ID
+  [server-id]                            Filter OS by compatible server ID
   [project-id=<retrieved from config>]   Project ID
   [zone=fr-par-1]                        Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | all)
 
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-raid-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-raid-get-usage.golden
index a95b696c3..11785b8d0 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-raid-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-raid-get-usage.golden
@@ -3,7 +3,7 @@
 Return raid for the given server ID.
 
 USAGE:
-  scw dedibox raid get <server-id ...> [arg=value ...]
+  scw dedibox raid get [arg=value ...]
 
 ARGS:
   server-id         ID of the server
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-raid-update-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-raid-update-usage.golden
index c8ceaa89d..f58ff2851 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-raid-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-raid-update-usage.golden
@@ -3,7 +3,7 @@
 Update RAID associated with the given server ID.
 
 USAGE:
-  scw dedibox raid update <server-id ...> [arg=value ...]
+  scw dedibox raid update [arg=value ...]
 
 ARGS:
   server-id                              ID of the server
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rescue-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rescue-get-usage.golden
index 42e4536a4..0602b9f42 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rescue-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rescue-get-usage.golden
@@ -3,7 +3,7 @@
 Return rescue information for the given server ID.
 
 USAGE:
-  scw dedibox rescue get <server-id ...> [arg=value ...]
+  scw dedibox rescue get [arg=value ...]
 
 ARGS:
   server-id         ID of the server to get rescue
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rescue-start-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rescue-start-usage.golden
index 9246e8aa5..70793cf74 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rescue-start-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rescue-start-usage.golden
@@ -3,7 +3,7 @@
 Start in rescue the server associated with the given ID.
 
 USAGE:
-  scw dedibox rescue start <server-id ...> [arg=value ...]
+  scw dedibox rescue start [arg=value ...]
 
 ARGS:
   server-id         ID of the server to start rescue
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rescue-stop-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rescue-stop-usage.golden
index 89c4b7843..8e1be9fe2 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rescue-stop-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rescue-stop-usage.golden
@@ -3,7 +3,7 @@
 Stop rescue on the server associated with the given ID.
 
 USAGE:
-  scw dedibox rescue stop <server-id ...> [arg=value ...]
+  scw dedibox rescue stop [arg=value ...]
 
 ARGS:
   server-id         ID of the server to stop rescue
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-reverse-ip-update-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-reverse-ip-update-usage.golden
index 87237c7bb..2490b569b 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-reverse-ip-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-reverse-ip-update-usage.golden
@@ -3,7 +3,7 @@
 Update reverse of ip associated with the given ID.
 
 USAGE:
-  scw dedibox reverse-ip update <ip-id ...> [arg=value ...]
+  scw dedibox reverse-ip update [arg=value ...]
 
 ARGS:
   ip-id             ID of the IP
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-add-members-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-add-members-usage.golden
index e8c426405..787074042 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-add-members-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-add-members-usage.golden
@@ -3,7 +3,7 @@
 Add-members dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v1 add-members <group-id ...> [arg=value ...]
+  scw dedibox rpn-v1 add-members [arg=value ...]
 
 ARGS:
   group-id                   The rpn v1 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-members-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-members-usage.golden
index fca17fbbf..a1fa1a109 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-members-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-members-usage.golden
@@ -3,7 +3,7 @@
 Delete-members dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v1 delete-members <group-id ...> [arg=value ...]
+  scw dedibox rpn-v1 delete-members [arg=value ...]
 
 ARGS:
   group-id             The rpn v1 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-usage.golden
index 76f51743f..32f7e2401 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-delete-usage.golden
@@ -3,7 +3,7 @@
 Delete dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v1 delete <group-id ...> [arg=value ...]
+  scw dedibox rpn-v1 delete [arg=value ...]
 
 ARGS:
   group-id   Rpn v1 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-get-usage.golden
index 4135df429..b0733e8fd 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-get-usage.golden
@@ -3,7 +3,7 @@
 Get dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v1 get <group-id ...> [arg=value ...]
+  scw dedibox rpn-v1 get [arg=value ...]
 
 ARGS:
   group-id   Rpn v1 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-update-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-update-usage.golden
index 57fe87c01..c141e0dd1 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v1-update-usage.golden
@@ -3,7 +3,7 @@
 Update dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v1 update <group-id ...> [arg=value ...]
+  scw dedibox rpn-v1 update [arg=value ...]
 
 ARGS:
   group-id   Rpn v1 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-add-members-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-add-members-usage.golden
index 812ce6eed..4e2671335 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-add-members-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-add-members-usage.golden
@@ -3,7 +3,7 @@
 Add-members dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v2 add-members <group-id ...> [arg=value ...]
+  scw dedibox rpn-v2 add-members [arg=value ...]
 
 ARGS:
   group-id          RPN V2 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-members-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-members-usage.golden
index 444fb4acb..e28f0ed7e 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-members-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-members-usage.golden
@@ -3,7 +3,7 @@
 Delete-members dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v2 delete-members <group-id ...> [arg=value ...]
+  scw dedibox rpn-v2 delete-members [arg=value ...]
 
 ARGS:
   group-id             RPN V2 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-usage.golden
index 39b7349f1..ff97b3274 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-delete-usage.golden
@@ -3,7 +3,7 @@
 Delete dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v2 delete <group-id ...> [arg=value ...]
+  scw dedibox rpn-v2 delete [arg=value ...]
 
 ARGS:
   group-id   RPN V2 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-disable-compatibility-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-disable-compatibility-usage.golden
index e496239ae..e42d79e32 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-disable-compatibility-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-disable-compatibility-usage.golden
@@ -3,7 +3,7 @@
 Disable-compatibility dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v2 disable-compatibility <group-id ...> [arg=value ...]
+  scw dedibox rpn-v2 disable-compatibility [arg=value ...]
 
 ARGS:
   group-id   RPN V2 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-get-usage.golden
index 180655f0f..319985185 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-get-usage.golden
@@ -3,7 +3,7 @@
 Get dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v2 get <group-id ...> [arg=value ...]
+  scw dedibox rpn-v2 get [arg=value ...]
 
 ARGS:
   group-id   RPN V2 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-usage.golden
index 199e080c0..9956f579e 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-usage.golden
@@ -3,7 +3,7 @@
 Update dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v2 update <group-id ...> [arg=value ...]
+  scw dedibox rpn-v2 update [arg=value ...]
 
 ARGS:
   group-id   RPN V2 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-vlan-members-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-vlan-members-usage.golden
index dc5832732..5bfb57cc9 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-vlan-members-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-rpn-v2-update-vlan-members-usage.golden
@@ -3,7 +3,7 @@
 Update-vlan-members dedibox resources.
 
 USAGE:
-  scw dedibox rpn-v2 update-vlan-members <group-id ...> [arg=value ...]
+  scw dedibox rpn-v2 update-vlan-members [arg=value ...]
 
 ARGS:
   group-id             RPN V2 group ID
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-cancel-install-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-cancel-install-usage.golden
index 8133b1dbc..c8c537f11 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-cancel-install-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-cancel-install-usage.golden
@@ -3,7 +3,7 @@
 Cancels the current server installation associated with the given server ID.
 
 USAGE:
-  scw dedibox server cancel-install <server-id ...> [arg=value ...]
+  scw dedibox server cancel-install [arg=value ...]
 
 ARGS:
   server-id         Server ID of the server to cancel install
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-delete-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-delete-usage.golden
index a8f606d08..fac19dafe 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-delete-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-delete-usage.golden
@@ -3,7 +3,7 @@
 Delete the server associated with the given ID.
 
 USAGE:
-  scw dedibox server delete <server-id ...> [arg=value ...]
+  scw dedibox server delete [arg=value ...]
 
 ARGS:
   server-id         Server ID to delete
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-get-install-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-get-install-usage.golden
index 6d37bbeaa..9df5d91c2 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-get-install-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-get-install-usage.golden
@@ -3,7 +3,7 @@
 Get the server installation status associated with the given server ID.
 
 USAGE:
-  scw dedibox server get-install <server-id ...> [arg=value ...]
+  scw dedibox server get-install [arg=value ...]
 
 ARGS:
   server-id         Server ID of the server to install
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-get-partitioning-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-get-partitioning-usage.golden
index af909f493..762aad177 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-get-partitioning-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-get-partitioning-usage.golden
@@ -3,7 +3,7 @@
 Get the server default partitioning schema associated with the given server ID and OS ID.
 
 USAGE:
-  scw dedibox server get-partitioning <server-id ...> [arg=value ...]
+  scw dedibox server get-partitioning [arg=value ...]
 
 ARGS:
   server-id         ID of the server
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-get-usage.golden
index 69afe5647..2b9a8a87f 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-get-usage.golden
@@ -3,7 +3,7 @@
 Get the server associated with the given ID.
 
 USAGE:
-  scw dedibox server get <server-id ...> [arg=value ...]
+  scw dedibox server get [arg=value ...]
 
 ARGS:
   server-id         ID of the server
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-install-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-install-usage.golden
index dc2716c83..b2ee923e2 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-install-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-install-usage.golden
@@ -3,7 +3,7 @@
 Install an OS on the server associated with the given ID.
 
 USAGE:
-  scw dedibox server install <server-id ...> [arg=value ...]
+  scw dedibox server install [arg=value ...]
 
 ARGS:
   server-id                                 Server ID to install
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-list-disks-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-list-disks-usage.golden
index ac13a91eb..4460e736f 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-list-disks-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-list-disks-usage.golden
@@ -3,7 +3,7 @@
 List disks associated to the given server ID.
 
 USAGE:
-  scw dedibox server list-disks <server-id ...> [arg=value ...]
+  scw dedibox server list-disks [arg=value ...]
 
 ARGS:
   [order-by]        Order of the server disks (created_at_asc | created_at_desc)
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-list-events-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-list-events-usage.golden
index dc22a57e5..86df25a8a 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-list-events-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-list-events-usage.golden
@@ -3,7 +3,7 @@
 List events associated to the given server ID.
 
 USAGE:
-  scw dedibox server list-events <server-id ...> [arg=value ...]
+  scw dedibox server list-events [arg=value ...]
 
 ARGS:
   [order-by]        Order of the server events (created_at_asc | created_at_desc)
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-list-options-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-list-options-usage.golden
deleted file mode 100644
index 33b0104f5..000000000
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-list-options-usage.golden
+++ /dev/null
@@ -1,19 +0,0 @@
-🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
-🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-List subscribable options associated to the given server ID.
-
-USAGE:
-  scw dedibox server list-options <server-id ...> [arg=value ...]
-
-ARGS:
-  server-id         Server ID of the subscribable server options
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1 | all)
-
-FLAGS:
-  -h, --help   help for list-options
-
-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-dedibox-server-reboot-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-reboot-usage.golden
index 30ad02d4d..aa8cf6113 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-reboot-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-reboot-usage.golden
@@ -3,7 +3,7 @@
 Reboot the server associated with the given ID, use boot param to reboot in rescue.
 
 USAGE:
-  scw dedibox server reboot <server-id ...> [arg=value ...]
+  scw dedibox server reboot [arg=value ...]
 
 ARGS:
   server-id         Server ID to reboot
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-start-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-start-usage.golden
index cfba21de3..df9bf37a9 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-start-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-start-usage.golden
@@ -3,7 +3,7 @@
 Start the server associated with the given ID.
 
 USAGE:
-  scw dedibox server start <server-id ...> [arg=value ...]
+  scw dedibox server start [arg=value ...]
 
 ARGS:
   server-id         Server ID to start
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-stop-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-stop-usage.golden
index 0ca8a1704..8a697195a 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-stop-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-stop-usage.golden
@@ -3,7 +3,7 @@
 Stop the server associated with the given ID.
 
 USAGE:
-  scw dedibox server stop <server-id ...> [arg=value ...]
+  scw dedibox server stop [arg=value ...]
 
 ARGS:
   server-id         Server ID to stop
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-subscribe-option-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-subscribe-option-usage.golden
deleted file mode 100644
index d4a3a7ff4..000000000
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-subscribe-option-usage.golden
+++ /dev/null
@@ -1,20 +0,0 @@
-🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
-🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Subscribe option for the given server ID.
-
-USAGE:
-  scw dedibox server subscribe-option <server-id ...> [arg=value ...]
-
-ARGS:
-  server-id         Server ID to subscribe server option
-  [option-id]       Option ID to subscribe
-  [zone=fr-par-1]   Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
-
-FLAGS:
-  -h, --help   help for subscribe-option
-
-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-dedibox-server-subscribe-storage-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-subscribe-storage-usage.golden
deleted file mode 100644
index ce9cfd368..000000000
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-subscribe-storage-usage.golden
+++ /dev/null
@@ -1,20 +0,0 @@
-🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
-🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Subscribe storage option for the given server ID.
-
-USAGE:
-  scw dedibox server subscribe-storage <server-id ...> [arg=value ...]
-
-ARGS:
-  server-id             Server ID of the storage options to subscribe
-  options-ids.{index}   Option IDs of the storage options to subscribe
-  [zone=fr-par-1]       Zone to target. If none is passed will use default zone from the config (fr-par-1 | fr-par-2 | nl-ams-1)
-
-FLAGS:
-  -h, --help   help for subscribe-storage
-
-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-dedibox-server-update-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-update-usage.golden
index b22e235c1..364e66695 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-update-usage.golden
@@ -3,7 +3,7 @@
 Update the server associated with the given ID.
 
 USAGE:
-  scw dedibox server update <server-id ...> [arg=value ...]
+  scw dedibox server update [arg=value ...]
 
 ARGS:
   server-id         Server ID to update
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-server-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-server-usage.golden
index dbb8244f7..a4a6de07c 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-server-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-server-usage.golden
@@ -6,23 +6,20 @@ USAGE:
   scw dedibox server <command>
 
 AVAILABLE COMMANDS:
-  cancel-install    Cancels the current (running) server installation
-  create            Create a baremetal server
-  delete            Delete a baremetal server
-  get               Get a specific baremetal server
-  get-install       Get a specific server installation status
-  get-partitioning  Get server default partitioning
-  install           Install a baremetal server
-  list              List baremetal servers for project
-  list-disks        List server disks
-  list-events       List server events
-  list-options      List subscribable server options
-  reboot            Reboot a baremetal server
-  start             Start a baremetal server
-  stop              Stop a baremetal server
-  subscribe-option  Subscribe server option
-  subscribe-storage Subscribe storage server option
-  update            Update a baremetal server
+  cancel-install   Cancels the current (running) server installation
+  create           Create a baremetal server
+  delete           Delete a baremetal server
+  get              Get a specific baremetal server
+  get-install      Get a specific server installation status
+  get-partitioning Get server default partitioning
+  install          Install a baremetal server
+  list             List baremetal servers for project
+  list-disks       List server disks
+  list-events      List server events
+  reboot           Reboot a baremetal server
+  start            Start a baremetal server
+  stop             Stop a baremetal server
+  update           Update a baremetal server
 
 FLAGS:
   -h, --help   help for server
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-service-delete-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-service-delete-usage.golden
index 07b3668ec..8164e6caa 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-service-delete-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-service-delete-usage.golden
@@ -3,7 +3,7 @@
 Delete the service associated with the given ID.
 
 USAGE:
-  scw dedibox service delete <service-id ...> [arg=value ...]
+  scw dedibox service delete [arg=value ...]
 
 ARGS:
   service-id        ID of the service
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-service-get-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-service-get-usage.golden
index 42de563ee..d2d30182c 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-service-get-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-service-get-usage.golden
@@ -3,7 +3,7 @@
 Get the service associated with the given ID.
 
 USAGE:
-  scw dedibox service get <service-id ...> [arg=value ...]
+  scw dedibox service get [arg=value ...]
 
 ARGS:
   service-id        ID of the service
diff --git a/cmd/scw/testdata/test-all-usage-dedibox-usage.golden b/cmd/scw/testdata/test-all-usage-dedibox-usage.golden
index 80774b0fe..bfd8667e5 100644
--- a/cmd/scw/testdata/test-all-usage-dedibox-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-dedibox-usage.golden
@@ -11,6 +11,7 @@ AVAILABLE COMMANDS:
   fip         Failover IPs commands
   ipv6-block  IPv6 block commands
   offer       Offer commands
+  option      Subscribable server options commands
   os          OS commands
   raid        RAID commands
   rescue      Rescue commands
diff --git a/cmd/scw/testdata/test-all-usage-tem-project-settings-usage.golden b/cmd/scw/testdata/test-all-usage-tem-project-settings-usage.golden
index d45618329..f25e139c0 100644
--- a/cmd/scw/testdata/test-all-usage-tem-project-settings-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-tem-project-settings-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-Project settings allow you to manage the configuration of your settings.
+Project settings allow you to manage the configuration of your projects.
 
 USAGE:
   scw tem project-settings
diff --git a/cmd/scw/testdata/test-all-usage-tem-usage.golden b/cmd/scw/testdata/test-all-usage-tem-usage.golden
index 3def7523d..83edb2fec 100644
--- a/cmd/scw/testdata/test-all-usage-tem-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-tem-usage.golden
@@ -9,6 +9,7 @@ AVAILABLE COMMANDS:
   blocklists       Blocklist
   domain           Domain management commands
   email            Email management commands
+  offers           Project offers management commands
   project-settings Project settings management commands
   webhook          Webhook management commands