diff --git a/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden b/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden
index 2bf72fc6d..b71229c5f 100644
--- a/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-container-namespace-create-usage.golden
@@ -12,6 +12,7 @@ ARGS:
   [description]                                  Description of the namespace to create
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [tags.{index}]                                 [ALPHA] Tags of the Serverless Container Namespace
   [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-container-namespace-update-usage.golden b/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden
index feeb0c641..20f00a9a0 100644
--- a/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-container-namespace-update-usage.golden
@@ -11,6 +11,7 @@ ARGS:
   [description]                                  Description of the namespace to update
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [tags.{index}]                                 [ALPHA] Tags of the Serverless Container Namespace
   [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-function-namespace-create-usage.golden b/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden
index 12e6d1ce0..cfcfb502d 100644
--- a/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-function-namespace-create-usage.golden
@@ -12,6 +12,7 @@ ARGS:
   [description]                                  Description of the namespace
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [tags.{index}]                                 [ALPHA] Tags of the Serverless Function Namespace
   [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-function-namespace-update-usage.golden b/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden
index 1d40eae52..fcab3ba3b 100644
--- a/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden
+++ b/cmd/scw/testdata/test-all-usage-function-namespace-update-usage.golden
@@ -11,6 +11,7 @@ ARGS:
   [description]                                  Description of the namespace
   [secret-environment-variables.{index}.key]     
   [secret-environment-variables.{index}.value]   
+  [tags.{index}]                                 [ALPHA] Tags of the Serverless Function Namespace
   [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/docs/commands/container.md b/docs/commands/container.md
index 245100545..984b69147 100644
--- a/docs/commands/container.md
+++ b/docs/commands/container.md
@@ -464,6 +464,7 @@ scw container namespace create [arg=value ...]
 | description |  | Description of the namespace to create |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
+| tags.{index} |  | [ALPHA] Tags of the Serverless Container Namespace |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 
@@ -551,6 +552,7 @@ scw container namespace update <namespace-id ...> [arg=value ...]
 | description |  | Description of the namespace to update |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
+| tags.{index} |  | [ALPHA] Tags of the Serverless Container Namespace |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 
diff --git a/docs/commands/function.md b/docs/commands/function.md
index e5242c6c5..43aac978f 100644
--- a/docs/commands/function.md
+++ b/docs/commands/function.md
@@ -493,6 +493,7 @@ scw function namespace create [arg=value ...]
 | description |  | Description of the namespace |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
+| tags.{index} |  | [ALPHA] Tags of the Serverless Function Namespace |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 
@@ -580,6 +581,7 @@ scw function namespace update <namespace-id ...> [arg=value ...]
 | description |  | Description of the namespace |
 | secret-environment-variables.{index}.key |  |  |
 | secret-environment-variables.{index}.value |  |  |
+| tags.{index} |  | [ALPHA] Tags of the Serverless Function Namespace |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 
diff --git a/internal/namespaces/container/v1beta1/container_cli.go b/internal/namespaces/container/v1beta1/container_cli.go
index 2ed4b43a5..16e3008e9 100644
--- a/internal/namespaces/container/v1beta1/container_cli.go
+++ b/internal/namespaces/container/v1beta1/container_cli.go
@@ -255,6 +255,13 @@ func containerNamespaceCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `[ALPHA] Tags of the Serverless Container Namespace`,
+				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) {
@@ -311,6 +318,13 @@ func containerNamespaceUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `[ALPHA] Tags of the Serverless Container Namespace`,
+				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) {
diff --git a/internal/namespaces/function/v1beta1/function_cli.go b/internal/namespaces/function/v1beta1/function_cli.go
index 0ffab7c50..bb1368e01 100644
--- a/internal/namespaces/function/v1beta1/function_cli.go
+++ b/internal/namespaces/function/v1beta1/function_cli.go
@@ -302,6 +302,13 @@ func functionNamespaceCreate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `[ALPHA] Tags of the Serverless Function Namespace`,
+				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) {
@@ -358,6 +365,13 @@ func functionNamespaceUpdate() *core.Command {
 				Deprecated: false,
 				Positional: false,
 			},
+			{
+				Name:       "tags.{index}",
+				Short:      `[ALPHA] Tags of the Serverless Function Namespace`,
+				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) {