diff --git a/docs/cli/reference.mdx b/docs/cli/reference.mdx
index 52ace1f5cb..ac3acaa3fa 100644
--- a/docs/cli/reference.mdx
+++ b/docs/cli/reference.mdx
@@ -1100,7 +1100,7 @@ nemo files filesets create [OPTIONS] [NAME]
 
 **Arguments:**
 
-* `<NAME>`: The name of the fileset. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots.
+* `<NAME>`: The name of the fileset. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
 
 **Options:**
 
@@ -3144,7 +3144,7 @@ nemo inference providers create [OPTIONS] [NAME]
 
 **Arguments:**
 
-* `<NAME>`: Name of the model provider. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots.
+* `<NAME>`: Name of the model provider. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
 
 **Options:**
 
@@ -5066,7 +5066,7 @@ nemo workspaces create [OPTIONS] [NAME]
 
 **Arguments:**
 
-* `<NAME>`: Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+* `<NAME>`: Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
 
 **Options:**
 
diff --git a/openapi/ga/individual/platform.openapi.yaml b/openapi/ga/individual/platform.openapi.yaml
index 234a7c54ae..359cbae96a 100644
--- a/openapi/ga/individual/platform.openapi.yaml
+++ b/openapi/ga/individual/platform.openapi.yaml
@@ -9416,11 +9416,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the fileset. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the fileset. Name must start with a lowercase letter,
+            be 2-63 characters, and use lowercase letters, digits, hyphens, and dots
+            (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - training-data-v1
           - llama-checkpoint
@@ -9686,11 +9687,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'Name of the model provider. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: Name of the model provider. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-nim-provider
           - openai-endpoint
@@ -10438,9 +10440,9 @@ components:
         name:
           title: Name
           description: Entity name (optional - auto-generated if not provided). Name
-            must start with a lowercase letter, be 2-63 characters, and contain only
-            lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -10475,8 +10477,8 @@ components:
         new_name:
           title: New Name
           description: Updated entity name (optional). Name must start with a lowercase
-            letter, be 2-63 characters, and contain only lowercase letters, digits,
-            and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -16003,9 +16005,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16053,9 +16055,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16480,9 +16482,12 @@ components:
       properties:
         name:
           type: string
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the secret to create. Allowed characters: letters
-            (a-z, A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the secret to create. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - hf-token
           - wandb-api-key
@@ -16682,8 +16687,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Project name (unique within workspace). Name must start with
-            a lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            a lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-project
           - nlp-research
@@ -19719,8 +19724,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Workspace name (unique identifier). Name must start with a
-            lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-team
           - research
diff --git a/openapi/ga/openapi.yaml b/openapi/ga/openapi.yaml
index 234a7c54ae..359cbae96a 100644
--- a/openapi/ga/openapi.yaml
+++ b/openapi/ga/openapi.yaml
@@ -9416,11 +9416,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the fileset. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the fileset. Name must start with a lowercase letter,
+            be 2-63 characters, and use lowercase letters, digits, hyphens, and dots
+            (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - training-data-v1
           - llama-checkpoint
@@ -9686,11 +9687,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'Name of the model provider. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: Name of the model provider. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-nim-provider
           - openai-endpoint
@@ -10438,9 +10440,9 @@ components:
         name:
           title: Name
           description: Entity name (optional - auto-generated if not provided). Name
-            must start with a lowercase letter, be 2-63 characters, and contain only
-            lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -10475,8 +10477,8 @@ components:
         new_name:
           title: New Name
           description: Updated entity name (optional). Name must start with a lowercase
-            letter, be 2-63 characters, and contain only lowercase letters, digits,
-            and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -16003,9 +16005,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16053,9 +16055,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16480,9 +16482,12 @@ components:
       properties:
         name:
           type: string
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the secret to create. Allowed characters: letters
-            (a-z, A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the secret to create. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - hf-token
           - wandb-api-key
@@ -16682,8 +16687,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Project name (unique within workspace). Name must start with
-            a lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            a lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-project
           - nlp-research
@@ -19719,8 +19724,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Workspace name (unique identifier). Name must start with a
-            lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-team
           - research
diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml
index 234a7c54ae..359cbae96a 100644
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -9416,11 +9416,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the fileset. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the fileset. Name must start with a lowercase letter,
+            be 2-63 characters, and use lowercase letters, digits, hyphens, and dots
+            (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - training-data-v1
           - llama-checkpoint
@@ -9686,11 +9687,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'Name of the model provider. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: Name of the model provider. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-nim-provider
           - openai-endpoint
@@ -10438,9 +10440,9 @@ components:
         name:
           title: Name
           description: Entity name (optional - auto-generated if not provided). Name
-            must start with a lowercase letter, be 2-63 characters, and contain only
-            lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -10475,8 +10477,8 @@ components:
         new_name:
           title: New Name
           description: Updated entity name (optional). Name must start with a lowercase
-            letter, be 2-63 characters, and contain only lowercase letters, digits,
-            and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -16003,9 +16005,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16053,9 +16055,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16480,9 +16482,12 @@ components:
       properties:
         name:
           type: string
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the secret to create. Allowed characters: letters
-            (a-z, A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the secret to create. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - hf-token
           - wandb-api-key
@@ -16682,8 +16687,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Project name (unique within workspace). Name must start with
-            a lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            a lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-project
           - nlp-research
@@ -19719,8 +19724,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Workspace name (unique identifier). Name must start with a
-            lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-team
           - research
diff --git a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/files/filesets.py b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/files/filesets.py
index 9ea72faeeb..b11d28b5aa 100644
--- a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/files/filesets.py
+++ b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/files/filesets.py
@@ -34,7 +34,7 @@ def create_filesets(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="The name of the fileset. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)"
+            help="The name of the fileset. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     workspace: Annotated[str | None, typer.Option("--workspace")] = None,
@@ -127,7 +127,7 @@ def create_filesets(
         ["name"],
         "files filesets create",
         {
-            "name": "The name of the fileset. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)",
+            "name": "The name of the fileset. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/inference/providers.py b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/inference/providers.py
index 7cd01b5937..44c6e126df 100644
--- a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/inference/providers.py
+++ b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/inference/providers.py
@@ -34,7 +34,7 @@ def create_providers(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="Name of the model provider. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)"
+            help="Name of the model provider. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     workspace: Annotated[str | None, typer.Option("--workspace")] = None,
@@ -179,7 +179,7 @@ def create_providers(
         "inference providers create",
         {
             "host_url": "The network endpoint URL for the model provider (required)",
-            "name": "Name of the model provider. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)",
+            "name": "Name of the model provider. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/projects.py b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/projects.py
index d7e2623feb..073d10a358 100644
--- a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/projects.py
+++ b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/projects.py
@@ -34,7 +34,7 @@ def create_projects(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)"
+            help="Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     workspace: Annotated[str | None, typer.Option("--workspace")] = None,
@@ -95,7 +95,7 @@ def create_projects(
         ["name"],
         "projects create",
         {
-            "name": "Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)",
+            "name": "Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/workspaces/__init__.py b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/workspaces/__init__.py
index e0a5be7791..30d201254d 100644
--- a/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/workspaces/__init__.py
+++ b/packages/nemo_platform_ext/src/nemo_platform_ext/cli/commands/api/workspaces/__init__.py
@@ -41,7 +41,7 @@ def create_workspaces(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)"
+            help="Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     wait_role_propagation: Annotated[
@@ -112,7 +112,7 @@ def create_workspaces(
         ["name"],
         "workspaces create",
         {
-            "name": "Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)",
+            "name": "Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/packages/nemo_platform_plugin/src/nemo_platform_plugin/entity_naming.py b/packages/nemo_platform_plugin/src/nemo_platform_plugin/entity_naming.py
new file mode 100644
index 0000000000..db8199affb
--- /dev/null
+++ b/packages/nemo_platform_plugin/src/nemo_platform_plugin/entity_naming.py
@@ -0,0 +1,25 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+"""Single definition of the entity name rule; ``nmp.common`` re-exports it.
+
+Lives here because ``nmp_common`` depends on this package, not the reverse.
+Models using ``pattern=NAME_PATTERN`` need ``regex_engine="python-re"``.
+"""
+
+# RFC 1035 compliant pattern with temporary support for special characters.
+# Allows lowercase letters, digits, hyphens, and temporarily: @, ., +, _
+# - Must start with a lowercase letter [a-z]
+# - Length: 2-63 characters
+# - No consecutive hyphens (--)
+# - Must not end with a hyphen
+# TODO(#3530): Remove @, ., +, _ once versioning is implemented and predefined target names (e.g., llama-3.2-3b-instruct@v1.0.0+A100) are updated.
+NAME_PATTERN = r"^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$"
+
+NAME_MAX_LENGTH = 63
+
+NAME_PATTERN_DESCRIPTION = (
+    "Name must start with a lowercase letter, be 2-63 characters, "
+    "and use lowercase letters, digits, hyphens, and dots "
+    "(no consecutive hyphens, cannot end with a hyphen)."
+)
diff --git a/packages/nemo_platform_plugin/src/nemo_platform_plugin/files/types.py b/packages/nemo_platform_plugin/src/nemo_platform_plugin/files/types.py
index c6ab68a847..1812d3fcc8 100644
--- a/packages/nemo_platform_plugin/src/nemo_platform_plugin/files/types.py
+++ b/packages/nemo_platform_plugin/src/nemo_platform_plugin/files/types.py
@@ -13,10 +13,11 @@
 from enum import StrEnum
 from typing import Any, NotRequired, TypedDict
 
+from nemo_platform_plugin.entity_naming import NAME_MAX_LENGTH, NAME_PATTERN, NAME_PATTERN_DESCRIPTION
 from nemo_platform_plugin.files.metadata import FilesetMetadata
 from nemo_platform_plugin.files.storage_config import StorageConfig
 from nemo_platform_plugin.schema import Page
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class FilesetPurpose(StrEnum):
@@ -74,18 +75,15 @@ class ListFilesetFilesResponse(BaseModel):
 # Request types
 # ---------------------------------------------------------------------------
 
-# Mirrors ``nmp.common.entities.constants.REGEX_WORD_CHARACTER_DOT_DASH`` (and its
-# description / MAX_LENGTH_255) — inlined so this module stays a dependency-free leaf
-# node. Reuse these constants for any fileset-name check rather than restating them.
-NAME_PATTERN = r"^[\w\-.]+$"
-NAME_PATTERN_DESCRIPTION = "Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots."
 MAX_LENGTH = 255
 
 
 class CreateFilesetRequest(BaseModel):
+    model_config = ConfigDict(regex_engine="python-re")
+
     name: str = Field(
         description=f"The name of the fileset. {NAME_PATTERN_DESCRIPTION}",
-        max_length=MAX_LENGTH,
+        max_length=NAME_MAX_LENGTH,
         pattern=NAME_PATTERN,
         examples=["training-data-v1", "llama-checkpoint"],
     )
diff --git a/packages/nemo_platform_plugin/src/nemo_platform_plugin/jobs/spec.py b/packages/nemo_platform_plugin/src/nemo_platform_plugin/jobs/spec.py
index 0f66b75d5f..c186d6047e 100644
--- a/packages/nemo_platform_plugin/src/nemo_platform_plugin/jobs/spec.py
+++ b/packages/nemo_platform_plugin/src/nemo_platform_plugin/jobs/spec.py
@@ -17,21 +17,11 @@
 
 from typing import Optional, Self
 
+from nemo_platform_plugin.entity_naming import NAME_PATTERN, NAME_PATTERN_DESCRIPTION
 from nemo_platform_plugin.jobs.constants import PERSISTENT_JOB_STORAGE_PATH_ENVVAR
 from nemo_platform_plugin.jobs.providers import Provider
 from pydantic import BaseModel, ConfigDict, Field, model_validator
 
-# RFC 1035 compliant pattern with temporary support for special characters.
-# Mirrors ``nmp.common.entities.constants.NAME_PATTERN`` — inlined so this
-# module stays a dependency-free leaf node (see files/types.py for the same
-# pattern of inlining name constraints into the plugin).
-NAME_PATTERN = r"^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$"
-NAME_PATTERN_DESCRIPTION = (
-    "Name must start with a lowercase letter, be 2-63 characters, "
-    "and contain only lowercase letters, digits, and hyphens "
-    "(no consecutive hyphens, cannot end with a hyphen)."
-)
-
 
 class PlatformJobSecretEnvironmentVariableRef(BaseModel):
     """Reference to a secret to populate an environment variable for a job step."""
diff --git a/packages/nemo_platform_plugin/src/nemo_platform_plugin/secrets/types.py b/packages/nemo_platform_plugin/src/nemo_platform_plugin/secrets/types.py
index b52581a149..cb5f218686 100644
--- a/packages/nemo_platform_plugin/src/nemo_platform_plugin/secrets/types.py
+++ b/packages/nemo_platform_plugin/src/nemo_platform_plugin/secrets/types.py
@@ -11,17 +11,11 @@
 
 from __future__ import annotations
 
-import re
 from datetime import datetime
 from typing import NotRequired, Self, TypedDict
 
-from pydantic import BaseModel, Field, SecretStr, field_serializer, field_validator, model_validator
-
-# Mirrors ``nmp.common.entities.constants.REGEX_WORD_CHARACTER_DOT_DASH``. Inlined
-# rather than imported so this package stays free of an ``nmp_common`` dependency
-# (matching the ``files.types`` boundary — plugin types own their own contract).
-_NAME_REGEX = r"^[\w\-.]+$"
-_NAME_RE: re.Pattern[str] = re.compile(_NAME_REGEX)
+from nemo_platform_plugin.entity_naming import NAME_MAX_LENGTH, NAME_PATTERN, NAME_PATTERN_DESCRIPTION
+from pydantic import BaseModel, ConfigDict, Field, SecretStr, field_serializer, model_validator
 
 # ---------------------------------------------------------------------------
 # Response types
@@ -67,26 +61,17 @@ class PlatformSecretCreateRequest(BaseModel):
     # server would store the mask instead of the secret. (Keep this as a comment,
     # not the class docstring, so it does not leak into the OpenAPI schema.)
 
+    model_config = ConfigDict(regex_engine="python-re")
+
     name: str = Field(
-        description=(
-            "The name of the secret to create. Allowed characters: letters (a-z, A-Z), "
-            "digits (0-9), underscores, hyphens, and dots."
-        ),
+        description=f"The name of the secret to create. {NAME_PATTERN_DESCRIPTION}",
+        max_length=NAME_MAX_LENGTH,
+        pattern=NAME_PATTERN,
         examples=["hf-token", "wandb-api-key"],
     )
     description: str | None = Field(default=None, description="An optional description of the secret")
     value: SecretStr = Field(description="The payload of the secret")
 
-    @field_validator("name")
-    @classmethod
-    def _validate_name(cls, v: str) -> str:
-        if not _NAME_RE.match(v):
-            raise ValueError(
-                f"Invalid secret name '{v}'. Allowed characters: letters, digits, underscores, "
-                "hyphens, and dots. Example: my-api-key"
-            )
-        return v
-
     @field_serializer("value", when_used="json")
     def _serialize_value(self, value: SecretStr) -> str:
         return value.get_secret_value()
diff --git a/packages/nmp_common/src/nmp/common/entities/constants.py b/packages/nmp_common/src/nmp/common/entities/constants.py
index 5977d6baa6..cfa93945fe 100644
--- a/packages/nmp_common/src/nmp/common/entities/constants.py
+++ b/packages/nmp_common/src/nmp/common/entities/constants.py
@@ -3,19 +3,14 @@
 
 """Constants for entity validation."""
 
-# RFC 1035 compliant pattern with temporary support for special characters.
-# Allows lowercase letters, digits, hyphens, and temporarily: @, ., +, _
-# - Must start with a lowercase letter [a-z]
-# - Length: 2-63 characters
-# - No consecutive hyphens (--)
-# - Must not end with a hyphen
-# TODO(#3530): Remove @, ., +, _ once versioning is implemented and predefined target names (e.g., llama-3.2-3b-instruct@v1.0.0+A100) are updated.
-NAME_PATTERN = r"^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$"
-
-NAME_PATTERN_DESCRIPTION = (
-    "Name must start with a lowercase letter, be 2-63 characters, "
-    "and contain only lowercase letters, digits, and hyphens "
-    "(no consecutive hyphens, cannot end with a hyphen)."
+from nemo_platform_plugin.entity_naming import (
+    NAME_MAX_LENGTH as NAME_MAX_LENGTH,
+)
+from nemo_platform_plugin.entity_naming import (
+    NAME_PATTERN as NAME_PATTERN,
+)
+from nemo_platform_plugin.entity_naming import (
+    NAME_PATTERN_DESCRIPTION as NAME_PATTERN_DESCRIPTION,
 )
 
 # Field length constraints
diff --git a/sdk/python/nemo-platform/.nmpcontext/openapi.yaml b/sdk/python/nemo-platform/.nmpcontext/openapi.yaml
index 234a7c54ae..359cbae96a 100644
--- a/sdk/python/nemo-platform/.nmpcontext/openapi.yaml
+++ b/sdk/python/nemo-platform/.nmpcontext/openapi.yaml
@@ -9416,11 +9416,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the fileset. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the fileset. Name must start with a lowercase letter,
+            be 2-63 characters, and use lowercase letters, digits, hyphens, and dots
+            (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - training-data-v1
           - llama-checkpoint
@@ -9686,11 +9687,12 @@ components:
       properties:
         name:
           type: string
-          maxLength: 255
-          pattern: ^[\w\-.]+$
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'Name of the model provider. Allowed characters: letters (a-z,
-            A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: Name of the model provider. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-nim-provider
           - openai-endpoint
@@ -10438,9 +10440,9 @@ components:
         name:
           title: Name
           description: Entity name (optional - auto-generated if not provided). Name
-            must start with a lowercase letter, be 2-63 characters, and contain only
-            lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -10475,8 +10477,8 @@ components:
         new_name:
           title: New Name
           description: Updated entity name (optional). Name must start with a lowercase
-            letter, be 2-63 characters, and contain only lowercase letters, digits,
-            and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - my-config
           - baseline-model-v1
@@ -16003,9 +16005,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16053,9 +16055,9 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: The name of the step. Must be unique for all steps in a job.
-            Name must start with a lowercase letter, be 2-63 characters, and contain
-            only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot
-            end with a hyphen).
+            Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+            letters, digits, hyphens, and dots (no consecutive hyphens, cannot end
+            with a hyphen).
           examples:
           - preprocess
           - train-model
@@ -16480,9 +16482,12 @@ components:
       properties:
         name:
           type: string
+          maxLength: 63
+          pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
-          description: 'The name of the secret to create. Allowed characters: letters
-            (a-z, A-Z), digits (0-9), underscores, hyphens, and dots.'
+          description: The name of the secret to create. Name must start with a lowercase
+            letter, be 2-63 characters, and use lowercase letters, digits, hyphens,
+            and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - hf-token
           - wandb-api-key
@@ -16682,8 +16687,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Project name (unique within workspace). Name must start with
-            a lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            a lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-project
           - nlp-research
@@ -19719,8 +19724,8 @@ components:
           pattern: ^[a-z](?!.*--)[a-z0-9\-@.+_]{1,62}(?<!-)$
           title: Name
           description: Workspace name (unique identifier). Name must start with a
-            lowercase letter, be 2-63 characters, and contain only lowercase letters,
-            digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+            lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+            hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
           examples:
           - ml-team
           - research
diff --git a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/files/filesets.py b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/files/filesets.py
index b00a5618bd..e886071617 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/files/filesets.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/files/filesets.py
@@ -34,7 +34,7 @@ def create_filesets(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="The name of the fileset. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)"
+            help="The name of the fileset. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     workspace: Annotated[str | None, typer.Option("--workspace")] = None,
@@ -127,7 +127,7 @@ def create_filesets(
         ["name"],
         "files filesets create",
         {
-            "name": "The name of the fileset. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)",
+            "name": "The name of the fileset. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/inference/providers.py b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/inference/providers.py
index 1450b94d0e..3fe49e4c57 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/inference/providers.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/inference/providers.py
@@ -34,7 +34,7 @@ def create_providers(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="Name of the model provider. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)"
+            help="Name of the model provider. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     workspace: Annotated[str | None, typer.Option("--workspace")] = None,
@@ -179,7 +179,7 @@ def create_providers(
         "inference providers create",
         {
             "host_url": "The network endpoint URL for the model provider (required)",
-            "name": "Name of the model provider. Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and dots. (required)",
+            "name": "Name of the model provider. Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/projects.py b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/projects.py
index a2280d26a4..8e7116ce58 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/projects.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/projects.py
@@ -34,7 +34,7 @@ def create_projects(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)"
+            help="Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     workspace: Annotated[str | None, typer.Option("--workspace")] = None,
@@ -95,7 +95,7 @@ def create_projects(
         ["name"],
         "projects create",
         {
-            "name": "Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)",
+            "name": "Project name (unique within workspace). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/workspaces/__init__.py b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/workspaces/__init__.py
index 661defd005..4572b95e68 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/workspaces/__init__.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/cli/commands/api/workspaces/__init__.py
@@ -41,7 +41,7 @@ def create_workspaces(
     name: Annotated[
         str | None,
         typer.Argument(
-            help="Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)"
+            help="Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)"
         ),
     ] = None,
     wait_role_propagation: Annotated[
@@ -112,7 +112,7 @@ def create_workspaces(
         ["name"],
         "workspaces create",
         {
-            "name": "Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with a hyphen). (required)",
+            "name": "Workspace name (unique identifier). Name must start with a lowercase letter, be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a hyphen). (required)",
         },
     )
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/resources/entities/entities.py b/sdk/python/nemo-platform/src/nemo_platform/resources/entities/entities.py
index 469cab7213..f121336985 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/resources/entities/entities.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/resources/entities/entities.py
@@ -98,8 +98,8 @@ def create(
           data: Entity-specific data (schema is opaque to entity store, validated by client SDK)
 
           name: Entity name (optional - auto-generated if not provided). Name must start with a
-              lowercase letter, be 2-63 characters, and contain only lowercase letters,
-              digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+              lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+              hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
 
           parent: Parent entity ID for nested entities
 
@@ -443,8 +443,8 @@ def update_entity_by_name(
               current version matches.
 
           new_name: Updated entity name (optional). Name must start with a lowercase letter, be 2-63
-              characters, and contain only lowercase letters, digits, and hyphens (no
-              consecutive hyphens, cannot end with a hyphen).
+              characters, and use lowercase letters, digits, hyphens, and dots (no consecutive
+              hyphens, cannot end with a hyphen).
 
           project: The name of the project associated with this entity
 
@@ -545,8 +545,8 @@ async def create(
           data: Entity-specific data (schema is opaque to entity store, validated by client SDK)
 
           name: Entity name (optional - auto-generated if not provided). Name must start with a
-              lowercase letter, be 2-63 characters, and contain only lowercase letters,
-              digits, and hyphens (no consecutive hyphens, cannot end with a hyphen).
+              lowercase letter, be 2-63 characters, and use lowercase letters, digits,
+              hyphens, and dots (no consecutive hyphens, cannot end with a hyphen).
 
           parent: Parent entity ID for nested entities
 
@@ -892,8 +892,8 @@ async def update_entity_by_name(
               current version matches.
 
           new_name: Updated entity name (optional). Name must start with a lowercase letter, be 2-63
-              characters, and contain only lowercase letters, digits, and hyphens (no
-              consecutive hyphens, cannot end with a hyphen).
+              characters, and use lowercase letters, digits, hyphens, and dots (no consecutive
+              hyphens, cannot end with a hyphen).
 
           project: The name of the project associated with this entity
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/resources/files/filesets.py b/sdk/python/nemo-platform/src/nemo_platform/resources/files/filesets.py
index 9b7afcb95f..05c7e329e9 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/resources/files/filesets.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/resources/files/filesets.py
@@ -96,8 +96,9 @@ def create(
         used.
 
         Args:
-          name: The name of the fileset. Allowed characters: letters (a-z, A-Z), digits (0-9),
-              underscores, hyphens, and dots.
+          name: The name of the fileset. Name must start with a lowercase letter, be 2-63
+              characters, and use lowercase letters, digits, hyphens, and dots (no consecutive
+              hyphens, cannot end with a hyphen).
 
           cache: Cache all files after creation. Only applies to external storage.
 
@@ -421,8 +422,9 @@ async def create(
         used.
 
         Args:
-          name: The name of the fileset. Allowed characters: letters (a-z, A-Z), digits (0-9),
-              underscores, hyphens, and dots.
+          name: The name of the fileset. Name must start with a lowercase letter, be 2-63
+              characters, and use lowercase letters, digits, hyphens, and dots (no consecutive
+              hyphens, cannot end with a hyphen).
 
           cache: Cache all files after creation. Only applies to external storage.
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/resources/inference/providers.py b/sdk/python/nemo-platform/src/nemo_platform/resources/inference/providers.py
index 87879cad0c..8b68b1aec5 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/resources/inference/providers.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/resources/inference/providers.py
@@ -103,8 +103,9 @@ def create(
         Args:
           host_url: The network endpoint URL for the model provider
 
-          name: Name of the model provider. Allowed characters: letters (a-z, A-Z), digits
-              (0-9), underscores, hyphens, and dots.
+          name: Name of the model provider. Name must start with a lowercase letter, be 2-63
+              characters, and use lowercase letters, digits, hyphens, and dots (no consecutive
+              hyphens, cannot end with a hyphen).
 
           api_key_secret_name: Reference to an API key secret stored in the Secrets service. Create the secret
               first via secrets API, then pass the secret name here.
@@ -554,8 +555,9 @@ async def create(
         Args:
           host_url: The network endpoint URL for the model provider
 
-          name: Name of the model provider. Allowed characters: letters (a-z, A-Z), digits
-              (0-9), underscores, hyphens, and dots.
+          name: Name of the model provider. Name must start with a lowercase letter, be 2-63
+              characters, and use lowercase letters, digits, hyphens, and dots (no consecutive
+              hyphens, cannot end with a hyphen).
 
           api_key_secret_name: Reference to an API key secret stored in the Secrets service. Create the secret
               first via secrets API, then pass the secret name here.
diff --git a/sdk/python/nemo-platform/src/nemo_platform/resources/inference/virtual_models.py b/sdk/python/nemo-platform/src/nemo_platform/resources/inference/virtual_models.py
index a1956e42b6..55404d9b38 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/resources/inference/virtual_models.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/resources/inference/virtual_models.py
@@ -32,7 +32,6 @@
     async_to_streamed_response_wrapper,
 )
 from ...pagination import SyncDefaultPagination, AsyncDefaultPagination
-from ..._exceptions import ConflictError
 from ..._base_client import AsyncPaginator, make_request_options
 from ...types.inference import (
     virtual_model_list_params,
@@ -44,6 +43,7 @@
 from ...types.inference.middleware_call_param import MiddlewareCallParam
 from ...types.inference.virtual_model_filter_param import VirtualModelFilterParam
 from ...types.inference.virtual_model_inference_config_param import VirtualModelInferenceConfigParam
+from ..._exceptions import ConflictError
 
 __all__ = ["VirtualModelsResource", "AsyncVirtualModelsResource"]
 
@@ -166,7 +166,7 @@ def create(
         except ConflictError:
             if not exist_ok:
                 raise
-            return self.retrieve(name=name, workspace=workspace)
+            return self.retrieve(name = name, workspace = workspace)
 
     def retrieve(
         self,
@@ -546,7 +546,7 @@ async def create(
         except ConflictError:
             if not exist_ok:
                 raise
-            return await self.retrieve(name=name, workspace=workspace)
+            return await self.retrieve(name = name, workspace = workspace)
 
     async def retrieve(
         self,
diff --git a/sdk/python/nemo-platform/src/nemo_platform/resources/projects/projects.py b/sdk/python/nemo-platform/src/nemo_platform/resources/projects/projects.py
index d55418bfcf..47d262ab63 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/resources/projects/projects.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/resources/projects/projects.py
@@ -86,7 +86,7 @@ def create(
 
         Args:
           name: Project name (unique within workspace). Name must start with a lowercase letter,
-              be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no
+              be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
               consecutive hyphens, cannot end with a hyphen).
 
           description: Optional description of the project
@@ -392,7 +392,7 @@ async def create(
 
         Args:
           name: Project name (unique within workspace). Name must start with a lowercase letter,
-              be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no
+              be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
               consecutive hyphens, cannot end with a hyphen).
 
           description: Optional description of the project
diff --git a/sdk/python/nemo-platform/src/nemo_platform/resources/secrets/secrets.py b/sdk/python/nemo-platform/src/nemo_platform/resources/secrets/secrets.py
index a5ad95eda7..ed73561ed3 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/resources/secrets/secrets.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/resources/secrets/secrets.py
@@ -89,8 +89,9 @@ def create(
         Args:
           name: The name of the secret to create.
 
-        Allowed characters: letters (a-z, A-Z), digits
-              (0-9), underscores, hyphens, and dots.
+        Name must start with a lowercase letter, be
+              2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
+              consecutive hyphens, cannot end with a hyphen).
 
           value: The payload of the secret
 
@@ -388,8 +389,9 @@ async def create(
         Args:
           name: The name of the secret to create.
 
-        Allowed characters: letters (a-z, A-Z), digits
-              (0-9), underscores, hyphens, and dots.
+        Name must start with a lowercase letter, be
+              2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
+              consecutive hyphens, cannot end with a hyphen).
 
           value: The payload of the secret
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/resources/workspaces/workspaces.py b/sdk/python/nemo-platform/src/nemo_platform/resources/workspaces/workspaces.py
index 1144266e61..bfc13495e8 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/resources/workspaces/workspaces.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/resources/workspaces/workspaces.py
@@ -102,7 +102,7 @@ def create(
 
         Args:
           name: Workspace name (unique identifier). Name must start with a lowercase letter, be
-              2-63 characters, and contain only lowercase letters, digits, and hyphens (no
+              2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
               consecutive hyphens, cannot end with a hyphen).
 
           wait_role_propagation: If true, wait for Admin role to propagate before returning (default: true). Set
@@ -410,7 +410,7 @@ async def create(
 
         Args:
           name: Workspace name (unique identifier). Name must start with a lowercase letter, be
-              2-63 characters, and contain only lowercase letters, digits, and hyphens (no
+              2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
               consecutive hyphens, cannot end with a hyphen).
 
           wait_role_propagation: If true, wait for Admin role to propagate before returning (default: true). Set
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_create_params.py b/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_create_params.py
index b2250b6b99..66bd81f118 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_create_params.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_create_params.py
@@ -34,9 +34,9 @@ class EntityCreateParams(TypedDict, total=False):
     name: str
     """Entity name (optional - auto-generated if not provided).
 
-    Name must start with a lowercase letter, be 2-63 characters, and contain only
-    lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with
-    a hyphen).
+    Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+    letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a
+    hyphen).
     """
 
     parent: str
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_update_entity_by_name_params.py b/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_update_entity_by_name_params.py
index 77f51ee3ee..29ad6d3af7 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_update_entity_by_name_params.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/entities/entity_update_entity_by_name_params.py
@@ -43,9 +43,9 @@ class EntityUpdateEntityByNameParams(TypedDict, total=False):
     new_name: str
     """Updated entity name (optional).
 
-    Name must start with a lowercase letter, be 2-63 characters, and contain only
-    lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with
-    a hyphen).
+    Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+    letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a
+    hyphen).
     """
 
     project: str
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/files/fileset_create_params.py b/sdk/python/nemo-platform/src/nemo_platform/types/files/fileset_create_params.py
index 9836fcb477..0a55aa1e32 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/files/fileset_create_params.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/files/fileset_create_params.py
@@ -36,8 +36,9 @@ class FilesetCreateParams(TypedDict, total=False):
     name: Required[str]
     """The name of the fileset.
 
-    Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and
-    dots.
+    Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+    letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a
+    hyphen).
     """
 
     cache: bool
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/inference/provider_create_params.py b/sdk/python/nemo-platform/src/nemo_platform/types/inference/provider_create_params.py
index 6040fc7563..9a21151bf5 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/inference/provider_create_params.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/inference/provider_create_params.py
@@ -35,8 +35,9 @@ class ProviderCreateParams(TypedDict, total=False):
     name: Required[str]
     """Name of the model provider.
 
-    Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and
-    dots.
+    Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+    letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a
+    hyphen).
     """
 
     api_key_secret_name: str
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec.py b/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec.py
index c23f1ec802..c1ccbeb9a4 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec.py
@@ -45,7 +45,7 @@ class PlatformJobStepSpec(BaseModel):
     """The name of the step.
 
     Must be unique for all steps in a job. Name must start with a lowercase letter,
-    be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no
+    be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
     consecutive hyphens, cannot end with a hyphen).
     """
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec_param.py b/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec_param.py
index d0577d2eb7..72f50e7687 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec_param.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/jobs/platform_job_step_spec_param.py
@@ -47,7 +47,7 @@ class PlatformJobStepSpecParam(TypedDict, total=False):
     """The name of the step.
 
     Must be unique for all steps in a job. Name must start with a lowercase letter,
-    be 2-63 characters, and contain only lowercase letters, digits, and hyphens (no
+    be 2-63 characters, and use lowercase letters, digits, hyphens, and dots (no
     consecutive hyphens, cannot end with a hyphen).
     """
 
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/projects/project_create_params.py b/sdk/python/nemo-platform/src/nemo_platform/types/projects/project_create_params.py
index f8965a4f04..831867a4fd 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/projects/project_create_params.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/projects/project_create_params.py
@@ -28,9 +28,9 @@ class ProjectCreateParams(TypedDict, total=False):
     name: Required[str]
     """Project name (unique within workspace).
 
-    Name must start with a lowercase letter, be 2-63 characters, and contain only
-    lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with
-    a hyphen).
+    Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+    letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a
+    hyphen).
     """
 
     description: str
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/secrets/secret_create_params.py b/sdk/python/nemo-platform/src/nemo_platform/types/secrets/secret_create_params.py
index 57c190c879..2840ee6d63 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/secrets/secret_create_params.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/secrets/secret_create_params.py
@@ -28,8 +28,9 @@ class SecretCreateParams(TypedDict, total=False):
     name: Required[str]
     """The name of the secret to create.
 
-    Allowed characters: letters (a-z, A-Z), digits (0-9), underscores, hyphens, and
-    dots.
+    Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+    letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a
+    hyphen).
     """
 
     value: Required[str]
diff --git a/sdk/python/nemo-platform/src/nemo_platform/types/workspaces/workspace_create_params.py b/sdk/python/nemo-platform/src/nemo_platform/types/workspaces/workspace_create_params.py
index 39b8357af6..b4bf7e59b4 100644
--- a/sdk/python/nemo-platform/src/nemo_platform/types/workspaces/workspace_create_params.py
+++ b/sdk/python/nemo-platform/src/nemo_platform/types/workspaces/workspace_create_params.py
@@ -26,9 +26,9 @@ class WorkspaceCreateParams(TypedDict, total=False):
     name: Required[str]
     """Workspace name (unique identifier).
 
-    Name must start with a lowercase letter, be 2-63 characters, and contain only
-    lowercase letters, digits, and hyphens (no consecutive hyphens, cannot end with
-    a hyphen).
+    Name must start with a lowercase letter, be 2-63 characters, and use lowercase
+    letters, digits, hyphens, and dots (no consecutive hyphens, cannot end with a
+    hyphen).
     """
 
     wait_role_propagation: bool
diff --git a/services/core/models/src/nmp/core/models/schemas.py b/services/core/models/src/nmp/core/models/schemas.py
index 2769c2a624..889e1d6e81 100644
--- a/services/core/models/src/nmp/core/models/schemas.py
+++ b/services/core/models/src/nmp/core/models/schemas.py
@@ -19,7 +19,7 @@
     MODEL_REF_PATTERN_DESCRIPTION,
     is_valid_model_ref,
 )
-from pydantic import AnyUrl, BaseModel, Field, field_validator
+from pydantic import AnyUrl, BaseModel, ConfigDict, Field, field_validator
 
 
 def get_model_id(prefix: str) -> str:
@@ -473,10 +473,12 @@ class ModelProviderSort(StrEnum):
 class CreateModelProviderRequest(BaseModel):
     """Request model for creating a ModelProvider."""
 
+    model_config = ConfigDict(regex_engine="python-re")
+
     name: str = Field(
-        description=f"Name of the model provider. {constants.REGEX_WORD_CHARACTER_DOT_DASH_DESCRIPTION}",
-        max_length=constants.MAX_LENGTH_255,
-        pattern=constants.REGEX_WORD_CHARACTER_DOT_DASH,
+        description=f"Name of the model provider. {constants.NAME_PATTERN_DESCRIPTION}",
+        max_length=constants.NAME_MAX_LENGTH,
+        pattern=constants.NAME_PATTERN,
         examples=["my-nim-provider", "openai-endpoint"],
     )
     project: Optional[str] = Field(
diff --git a/services/core/secrets/tests/integration/test_secrets_with_auth.py b/services/core/secrets/tests/integration/test_secrets_with_auth.py
index f1caac08d6..e79a8ef353 100644
--- a/services/core/secrets/tests/integration/test_secrets_with_auth.py
+++ b/services/core/secrets/tests/integration/test_secrets_with_auth.py
@@ -34,7 +34,7 @@
     short_unique_name,
     unique_email,
 )
-from pydantic import SecretStr
+from pydantic import SecretStr, ValidationError
 
 # Service principals have elevated access (like platform admin)
 SERVICE_PRINCIPAL = "service:integration-test"
@@ -997,9 +997,16 @@ def test_create_secret_with_uppercase_returns_422(self, sdk: NeMoPlatform):
         # Name with uppercase letter - violates DNS-compliant naming rules
         invalid_name = "test-secret-123-Test"
 
+        with pytest.raises(ValidationError) as local_exc:
+            PlatformSecretCreateRequest(name=invalid_name, value=SecretStr("test-value"))
+        assert "should match pattern" in str(local_exc.value).lower()
+
+        # model_construct skips validation so the name still reaches the server.
         with pytest.raises(ClientUnprocessableEntityError) as exc_info:
             admin_secrets.create_secret(
-                body=PlatformSecretCreateRequest(name=invalid_name, value=SecretStr("test-value")),
+                body=PlatformSecretCreateRequest.model_construct(
+                    name=invalid_name, value=SecretStr("test-value"), description=None
+                ),
                 workspace="default",
             )
 
@@ -1016,9 +1023,15 @@ def test_create_secret_with_all_uppercase_returns_422(self, sdk: NeMoPlatform):
         admin_secrets = client_from_platform(admin_sdk, SecretsClient)
         invalid_name = "TEST-SECRET"
 
+        with pytest.raises(ValidationError) as local_exc:
+            PlatformSecretCreateRequest(name=invalid_name, value=SecretStr("test-value"))
+        assert "should match pattern" in str(local_exc.value).lower()
+
         with pytest.raises(ClientUnprocessableEntityError) as exc_info:
             admin_secrets.create_secret(
-                body=PlatformSecretCreateRequest(name=invalid_name, value=SecretStr("test-value")),
+                body=PlatformSecretCreateRequest.model_construct(
+                    name=invalid_name, value=SecretStr("test-value"), description=None
+                ),
                 workspace="default",
             )
 
diff --git a/services/core/secrets/tests/test_secrets.py b/services/core/secrets/tests/test_secrets.py
index ef3aed559d..6b33b264ca 100644
--- a/services/core/secrets/tests/test_secrets.py
+++ b/services/core/secrets/tests/test_secrets.py
@@ -65,18 +65,26 @@ async def test_create_secret_with_empty_value(test_client):
     assert response.status_code == 422
 
 
-@pytest.mark.parametrize("invalid_name", ["bad name", "bad/name", "no!way", "a@b"])
-async def test_create_secret_with_invalid_name_returns_friendly_error(test_client, invalid_name):
-    """Verify that names with disallowed characters return a 422 with a readable message."""
+@pytest.mark.parametrize(
+    "invalid_name",
+    ["bad name", "bad/name", "no!way", "MySecret", "1secret", "my--secret", "secret-", "a" * 64],
+)
+async def test_create_secret_with_invalid_name_is_rejected(test_client, invalid_name):
+    """Names the entity store would reject must fail at the API boundary, not downstream."""
     response = test_client.post(
         "/apis/secrets/v2/workspaces/default/secrets",
         json={"name": invalid_name, "value": "x"},
     )
     assert response.status_code == 422
-    detail = response.json()["detail"]
-    msg = detail[0]["msg"]
-    assert "Invalid secret name" in msg
-    assert invalid_name in msg
+
+
+@pytest.mark.parametrize("valid_name", ["hf-token", "a@b", "model.v1", "svc_key", "ab"])
+async def test_create_secret_accepts_entity_store_names(test_client, valid_name):
+    response = test_client.post(
+        "/apis/secrets/v2/workspaces/default/secrets",
+        json={"name": valid_name, "value": "x"},
+    )
+    assert response.status_code == 201
 
 
 async def test_create_and_delete_secret(test_client):