diff --git a/client/src/components/ComposeEditor/StackPanel.tsx b/client/src/components/ComposeEditor/StackPanel.tsx
index 8deadbd5..5b4d91ab 100644
--- a/client/src/components/ComposeEditor/StackPanel.tsx
+++ b/client/src/components/ComposeEditor/StackPanel.tsx
@@ -77,7 +77,13 @@ const StackPanel: React.FC<StackPanelProps> = ({
             name={'name'}
             label={'Stack name'}
             initialValue={generateReadableName()}
-            rules={[{ required: true, message: 'Please enter a name' }]}
+            rules={[
+              { required: true, message: 'Please enter a name' },
+              {
+                pattern: /^(?!.*[:\/\\_.]).*$/,
+                message: 'Characters not allowed',
+              },
+            ]}
             fieldProps={{
               addonBefore: (
                 <StackIconSelector
diff --git a/client/src/pages/ComposeEditor/index.tsx b/client/src/pages/ComposeEditor/index.tsx
index 6c7d3b29..43918c70 100644
--- a/client/src/pages/ComposeEditor/index.tsx
+++ b/client/src/pages/ComposeEditor/index.tsx
@@ -397,7 +397,13 @@ const ComposeEditor = () => {
                 <ProFormText
                   name={'name'}
                   placeholder={'Name'}
-                  rules={[{ required: true, message: 'Please enter a name' }]}
+                  rules={[
+                    { required: true, message: 'Please enter a name' },
+                    {
+                      pattern: /^(?!.*[:\/\\_.]).*$/,
+                      message: 'Characters not allowed',
+                    },
+                  ]}
                   fieldProps={{
                     ref: nameRef,
                     defaultValue:
diff --git a/server/src/helpers/docker/utils.ts b/server/src/helpers/docker/utils.ts
new file mode 100644
index 00000000..030ac740
--- /dev/null
+++ b/server/src/helpers/docker/utils.ts
@@ -0,0 +1,14 @@
+import yaml from 'js-yaml';
+import logger from '../../logger';
+
+export function extractTopLevelName(content: string): string | undefined {
+  try {
+    const parsedYaml = yaml.load(content);
+    if (typeof parsedYaml === 'object' && parsedYaml !== null) {
+      return (parsedYaml as { [key: string]: any }).name;
+    }
+  } catch (err: any) {
+    logger.error('Error parsing YAML:' + err.message);
+  }
+  return undefined;
+}
diff --git a/server/src/modules/repository/ContainerCustomStacksRepositoryComponent.ts b/server/src/modules/repository/ContainerCustomStacksRepositoryComponent.ts
index 1b3f1f41..e7fc8429 100644
--- a/server/src/modules/repository/ContainerCustomStacksRepositoryComponent.ts
+++ b/server/src/modules/repository/ContainerCustomStacksRepositoryComponent.ts
@@ -10,6 +10,7 @@ import ContainerCustomStack from '../../data/database/model/ContainerCustomStack
 import ContainerCustomStackRepository from '../../data/database/model/ContainerCustomStackRepository';
 import ContainerCustomStackRepo from '../../data/database/repository/ContainerCustomStackRepo';
 import ContainerStacksRepositoryRepo from '../../data/database/repository/ContainerCustomStackRepositoryRepo';
+import { extractTopLevelName } from '../../helpers/docker/utils';
 import { FileInfo, getMatchingFiles } from '../../helpers/files/recursive-find';
 import logger from '../../logger';
 import { NotFoundError } from '../../middlewares/api/ApiError';
@@ -152,11 +153,18 @@ class ContainerCustomStacksRepositoryComponent extends EventManager {
       `Processing stack ${JSON.stringify(foundStack)} - In database: ${stackFoundInDatabase ? 'true' : 'false'}`,
     );
     const stackContent = FileSystemManager.readFile(foundStack.fullPath as string);
+    const embeddedProjectName = extractTopLevelName(stackContent);
     const stackData: ContainerCustomStack = {
       path: foundStack.fullPath,
       name:
         stackFoundInDatabase?.name ||
-        foundStack.fullPath.split(`${this.uuid}/`)[1].replaceAll('/', '_').toLowerCase(),
+        embeddedProjectName ||
+        foundStack.fullPath
+          .split(`${this.uuid}/`)[1]
+          .replaceAll('/', '-')
+          .replaceAll(':', '-')
+          .replaceAll('.', '-')
+          .toLowerCase(),
       containerCustomStackRepository: containerCustomStackRepository,
       uuid: stackFoundInDatabase?.uuid || uuidv4(),
       lockJson: true,
diff --git a/shared-lib/src/types/api.ts b/shared-lib/src/types/api.ts
index be38bf0f..e6d4ac9b 100644
--- a/shared-lib/src/types/api.ts
+++ b/shared-lib/src/types/api.ts
@@ -865,6 +865,7 @@ export type ContainerCustomStack = {
   json: object;
   yaml: string;
   name: string;
+  type: string;
   rawStackValue: object;
   lockJson: boolean;
   icon: string;