diff --git a/Apps/2FAuth/docker-compose.yml b/Apps/2FAuth/docker-compose.yml
index 3d52580d6..ca5a45f8a 100644
--- a/Apps/2FAuth/docker-compose.yml
+++ b/Apps/2FAuth/docker-compose.yml
@@ -25,6 +25,7 @@ services:
         - container: /2fauth
           description:
             en_us: ""
+    container_name: 2fauth
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/AdGuardHome/docker-compose.yml b/Apps/AdGuardHome/docker-compose.yml
index a1ddd4ae3..e1786fa67 100644
--- a/Apps/AdGuardHome/docker-compose.yml
+++ b/Apps/AdGuardHome/docker-compose.yml
@@ -56,6 +56,7 @@ services:
         - container: /opt/adguardhome/conf
           description:
             en_us: ""
+    container_name: adguard-home
 x-casaos:
   architectures:
     - "386"
diff --git a/Apps/Adminer/docker-compose.yml b/Apps/Adminer/docker-compose.yml
index 69f5a8559..17a5bcd78 100644
--- a/Apps/Adminer/docker-compose.yml
+++ b/Apps/Adminer/docker-compose.yml
@@ -15,6 +15,7 @@ services:
           description:
             en_us: Adminer HTTP Port
             zh_cn: Adminer HTTP 端口
+    container_name: adminer
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Alist/docker-compose.yml b/Apps/Alist/docker-compose.yml
index 838265914..e038c62db 100644
--- a/Apps/Alist/docker-compose.yml
+++ b/Apps/Alist/docker-compose.yml
@@ -27,6 +27,7 @@ services:
           description:
             en_us: alist config directory.
             zh_cn: alist 配置目录
+    container_name: alist
 x-casaos:
   architectures:
     - amd64
@@ -53,4 +54,4 @@ x-casaos:
       en_us: After installation, view the initial password in the log.
       zh_cn: 安装完成后，请在日志中查看初始密码。
   title:
-    en_us: Alist
\ No newline at end of file
+    en_us: Alist
diff --git a/Apps/Bazarr/docker-compose.yml b/Apps/Bazarr/docker-compose.yml
index c322c9fcd..e76362dd5 100644
--- a/Apps/Bazarr/docker-compose.yml
+++ b/Apps/Bazarr/docker-compose.yml
@@ -52,6 +52,7 @@ services:
         - container: /config
           description:
             en_us: ""
+    container_name: bazarr
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Calibre-web/docker-compose.yml b/Apps/Calibre-web/docker-compose.yml
index 2f0685490..c01427599 100644
--- a/Apps/Calibre-web/docker-compose.yml
+++ b/Apps/Calibre-web/docker-compose.yml
@@ -50,6 +50,7 @@ services:
         - container: /books
           description:
             en_us: ""
+    container_name: calibre-web
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/ChatGPT-Next-Web/docker-compose.yml b/Apps/ChatGPT-Next-Web/docker-compose.yml
index fcda1e3fd..349b8977e 100644
--- a/Apps/ChatGPT-Next-Web/docker-compose.yml
+++ b/Apps/ChatGPT-Next-Web/docker-compose.yml
@@ -43,6 +43,7 @@ services:
             en_us: WebUI HTTP Port
             zh_cn: WebUI HTTP 端口
 
+    container_name: chatgpt-next-web
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/ChatbotUI/docker-compose.yml b/Apps/ChatbotUI/docker-compose.yml
index afce3f9e2..5b6f8d9f2 100644
--- a/Apps/ChatbotUI/docker-compose.yml
+++ b/Apps/ChatbotUI/docker-compose.yml
@@ -17,6 +17,7 @@ services:
         - container: "3000"
           description:
             en_us: WebUI HTTP Port
+    container_name: chatbot-ui
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Cloudflared/docker-compose.yml b/Apps/Cloudflared/docker-compose.yml
index e8fcf3843..68da39028 100644
--- a/Apps/Cloudflared/docker-compose.yml
+++ b/Apps/Cloudflared/docker-compose.yml
@@ -1,6 +1,6 @@
-name: Cloudflared
+name: cloudflared
 services:
-  app:
+  cloudflared:
     image: wisdomsky/casaos-cloudflared:1.0
     restart: unless-stopped
     network_mode: host
@@ -41,12 +41,13 @@ services:
       - type: bind
         source: /DATA/AppData/casaos-cloudflared/config
         target: /config
+    container_name: cloudflared
 x-casaos:
   architectures:
     - amd64
     - arm
     - arm64
-  main: app
+  main: cloudflared
   description:
     en_us: Cloudflare Tunnel offers an easy way to expose web servers securely to the internet, without opening up firewall ports and configuring ACLs. Cloudflare Tunnel also ensures requests route through Cloudflare before reaching the web server, so you can be sure attack traffic is stopped with Cloudflare’s WAF and Unmetered DDoS mitigation, and authenticated with Access if you’ve enabled those features for your account.
     zh_cn: Cloudflare Tunnel 提供了一种安全的方式，可以将 Web 服务器安全地公开到互联网上，而无需打开防火墙端口和配置访问控制列表（ACL）。Cloudflare Tunnel 还确保请求在到达 Web 服务器之前通过 Cloudflare 路由，因此您可以确保攻击流量会被 Cloudflare 的 WAF 和无限制的 DDoS 缓解功能阻止，并在启用了这些功能的情况下通过 Access 进行身份验证。
diff --git a/Apps/Databag/docker-compose.yml b/Apps/Databag/docker-compose.yml
index 2b4a9989b..5374fcf76 100644
--- a/Apps/Databag/docker-compose.yml
+++ b/Apps/Databag/docker-compose.yml
@@ -1,4 +1,4 @@
-name: Databag
+name: databag
 services:
   databag:
     image: balzack/databag:0.1.5
@@ -20,6 +20,7 @@ services:
       - type: bind
         source: /DATA/AppData/databag/data
         target: /var/lib/databag
+    container_name: databag
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Ddns-go/docker-compose.yml b/Apps/Ddns-go/docker-compose.yml
index ea33e17fe..bf6083b0d 100644
--- a/Apps/Ddns-go/docker-compose.yml
+++ b/Apps/Ddns-go/docker-compose.yml
@@ -27,6 +27,7 @@ services:
           description:
             en_us: ddns-go config directory.
             zh_cn: ddns-go 配置目录
+    container_name: ddns-go
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Deluge/docker-compose.yml b/Apps/Deluge/docker-compose.yml
index f7210e192..c254d865d 100644
--- a/Apps/Deluge/docker-compose.yml
+++ b/Apps/Deluge/docker-compose.yml
@@ -74,6 +74,7 @@ services:
           description:
             en_us: Deluge Accessible directory.
             zh_cn: Deluge 可访问目录。
+    container_name: deluge
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Duplicati/docker-compose.yml b/Apps/Duplicati/docker-compose.yml
index 8fb14882f..8e1b8e394 100644
--- a/Apps/Duplicati/docker-compose.yml
+++ b/Apps/Duplicati/docker-compose.yml
@@ -52,6 +52,7 @@ services:
         - container: /source
           description:
             en_us: ""
+    container_name: duplicati
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Emby/docker-compose.yml b/Apps/Emby/docker-compose.yml
index d9a0e2475..46c2a676b 100644
--- a/Apps/Emby/docker-compose.yml
+++ b/Apps/Emby/docker-compose.yml
@@ -65,6 +65,7 @@ services:
         - container: /data/movies
           description:
             en_us: ""
+    container_name: emby
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Embystat/docker-compose.yml b/Apps/Embystat/docker-compose.yml
index ef9758221..50d856f85 100644
--- a/Apps/Embystat/docker-compose.yml
+++ b/Apps/Embystat/docker-compose.yml
@@ -40,6 +40,7 @@ services:
         - container: /config
           description:
             en_us: ""
+    container_name: embystat
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/EmulatorJS/docker-compose.yml b/Apps/EmulatorJS/docker-compose.yml
index 3d08efb41..fd980da34 100644
--- a/Apps/EmulatorJS/docker-compose.yml
+++ b/Apps/EmulatorJS/docker-compose.yml
@@ -40,6 +40,7 @@ services:
           description:
             en_us: Manage ROMS
             zh_cn: ROM 管理
+    container_name: emulatorjs
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/FileBrowser/docker-compose.yml b/Apps/FileBrowser/docker-compose.yml
index 6c4c5e29d..36b1e2f72 100644
--- a/Apps/FileBrowser/docker-compose.yml
+++ b/Apps/FileBrowser/docker-compose.yml
@@ -52,6 +52,7 @@ services:
           description:
             en_us: FileBrowser managed directory.
             zh_cn: FileBrowser管理的目录
+    container_name: filebrowser
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Gitea/docker-compose.yml b/Apps/Gitea/docker-compose.yml
index 77a7d2512..116177348 100644
--- a/Apps/Gitea/docker-compose.yml
+++ b/Apps/Gitea/docker-compose.yml
@@ -48,6 +48,7 @@ services:
           description:
             en_us: Gitea data directory.
             zh_cn: Gitea 数据目录。
+    container_name: gitea
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Grafana/docker-compose.yml b/Apps/Grafana/docker-compose.yml
index 4b6f93da3..24d7ab3b0 100644
--- a/Apps/Grafana/docker-compose.yml
+++ b/Apps/Grafana/docker-compose.yml
@@ -27,6 +27,7 @@ services:
             en_us: Grafana database and plugins directory.
             zh_cn: Grafana 数据库和插件目录
 
+    container_name: grafana
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Handbrake/docker-compose.yml b/Apps/Handbrake/docker-compose.yml
index 29e3c550b..3e261c50d 100644
--- a/Apps/Handbrake/docker-compose.yml
+++ b/Apps/Handbrake/docker-compose.yml
@@ -22,6 +22,7 @@ services:
       - type: bind
         source: /DATA/AppData/$AppID/config
         target: /config
+    container_name: handbrake
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/HomeAssistant/docker-compose.yml b/Apps/HomeAssistant/docker-compose.yml
index d40a89a5d..804cc871e 100644
--- a/Apps/HomeAssistant/docker-compose.yml
+++ b/Apps/HomeAssistant/docker-compose.yml
@@ -36,6 +36,7 @@ services:
           description:
             en_us: HomeAssistant config directory.
             zh_cn: HomeAssistant配置目录
+    container_name: homeassistant
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Jackett/docker-compose.yml b/Apps/Jackett/docker-compose.yml
index 3cadebec4..65b6ee6b7 100644
--- a/Apps/Jackett/docker-compose.yml
+++ b/Apps/Jackett/docker-compose.yml
@@ -50,6 +50,7 @@ services:
         - container: /downloads
           description:
             en_us: ""
+    container_name: jackett
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Jellyfin/docker-compose.yml b/Apps/Jellyfin/docker-compose.yml
index 372d834d5..6a6517afc 100644
--- a/Apps/Jellyfin/docker-compose.yml
+++ b/Apps/Jellyfin/docker-compose.yml
@@ -94,6 +94,7 @@ services:
           description:
             en_us: OpenMax libs
             zh_cn: OpenMax库
+    container_name: jellyfin
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Lazylibrarian/docker-compose.yml b/Apps/Lazylibrarian/docker-compose.yml
index 339b01d94..ae8bfde23 100644
--- a/Apps/Lazylibrarian/docker-compose.yml
+++ b/Apps/Lazylibrarian/docker-compose.yml
@@ -56,6 +56,7 @@ services:
         - container: /config
           description:
             en_us: ""
+    container_name: lazylibrarian
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Lidarr/docker-compose.yml b/Apps/Lidarr/docker-compose.yml
index 0917f3d38..f0b7c703f 100644
--- a/Apps/Lidarr/docker-compose.yml
+++ b/Apps/Lidarr/docker-compose.yml
@@ -52,6 +52,7 @@ services:
         - container: /downloads
           description:
             en_us: ""
+    container_name: lidarr
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/MariaDB/docker-compose.yml b/Apps/MariaDB/docker-compose.yml
index a3778d27c..4437a53d7 100644
--- a/Apps/MariaDB/docker-compose.yml
+++ b/Apps/MariaDB/docker-compose.yml
@@ -1,6 +1,6 @@
-name: MariaDB
+name: mariadb
 services:
-  app:
+  mariadb:
     image: linuxserver/mariadb:10.11.4
     restart: unless-stopped
     environment:
@@ -46,12 +46,13 @@ services:
       - type: bind
         source: /DATA/AppData/mariadb/config
         target: /config
+    container_name: mariadb
 x-casaos:
   architectures:
     - amd64
     - arm
     - arm64
-  main: app
+  main: mariadb
   description:
     en_us: |
       MariaDB Server is one of the most popular open source relational databases. It’s made by the original developers of MySQL and guaranteed to stay open source. It is part of most cloud offerings and the default in most Linux distributions.
diff --git a/Apps/Memos/docker-compose.yml b/Apps/Memos/docker-compose.yml
index 218d8fce4..172b042e6 100644
--- a/Apps/Memos/docker-compose.yml
+++ b/Apps/Memos/docker-compose.yml
@@ -43,6 +43,7 @@ services:
             en_us: memos data directory.
             zh_cn: memos 数据目录
 
+    container_name: memos
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Mongo/docker-compose.yml b/Apps/Mongo/docker-compose.yml
index 0f64acdb9..89497f366 100644
--- a/Apps/Mongo/docker-compose.yml
+++ b/Apps/Mongo/docker-compose.yml
@@ -50,6 +50,7 @@ services:
       - type: bind
         source: /DATA/AppData/mongo/data/db
         target: /data/db
+    container_name: mongo
 x-casaos:
   architectures:
     - amd64
@@ -69,7 +70,7 @@ x-casaos:
     pl_pl: MongoDB to darmowy i otwartoźródłowy, wieloplatformowy program bazodanowy zorientowany na dokumenty. MongoDB jest klasyfikowana jako program bazodanowy NoSQL i wykorzystuje dokumenty w formacie JSON z schematami. MongoDB jest rozwijana przez MongoDB Inc. i jest publikowana na zasadach licencji Server Side Public License oraz licencji Apache.
     pt_br: O MongoDB é um programa de banco de dados orientado a documentos, gratuito e de código aberto, multiplataforma. Classificado como um programa de banco de dados NoSQL, o MongoDB utiliza documentos semelhantes a JSON com esquemas. O MongoDB é desenvolvido pela MongoDB Inc. e é publicado sob uma combinação da Licença Pública do Lado do Servidor e da Licença Apache.
   tagline:
-    en_us: A free and open-source cross-platform document-oriented database program. Classified as a NoSQL database program, MongoDB uses JSON-like documents with schemata. 
+    en_us: A free and open-source cross-platform document-oriented database program. Classified as a NoSQL database program, MongoDB uses JSON-like documents with schemata.
     zh_cn: 一个免费且开源的跨平台面向文档的数据库程序。MongoDB 被归类为 NoSQL 数据库程序，它使用具有模式的类似 JSON 的文档。
     ar_sa: برنامج قاعدة بيانات وثائقية عابرة المنصات ومفتوح المصدر ومجاني. يُصنف MongoDB كبرنامج قاعدة بيانات NoSQL، ويستخدم وثائق تشبه JSON مع تخطيطات.
     de_de: Ein kostenloses und Open-Source, plattformübergreifendes, dokumentenorientiertes Datenbankprogramm. MongoDB wird als NoSQL-Datenbankprogramm eingestuft und verwendet JSON-ähnliche Dokumente mit Schemata.
diff --git a/Apps/MongoDB4/docker-compose.yml b/Apps/MongoDB4/docker-compose.yml
index 83b34d63f..1c04938b5 100644
--- a/Apps/MongoDB4/docker-compose.yml
+++ b/Apps/MongoDB4/docker-compose.yml
@@ -1,6 +1,6 @@
-name: MongoDB4
+name: mongodb4
 services:
-  mongo:
+  mongodb4:
     image: mongo:4.4.22
     restart: unless-stopped
     environment:
@@ -50,12 +50,13 @@ services:
       - type: bind
         source: /DATA/AppData/mongodb4/data/db
         target: /data/db
+    container_name: mongodb4
 x-casaos:
   architectures:
     - amd64
     - arm
     - arm64
-  main: mongo
+  main: mongodb4
   description:
     en_us: MongoDB is a free and open-source cross-platform document-oriented database program. Classified as a NoSQL database program, MongoDB uses JSON-like documents with schemata. MongoDB is developed by MongoDB Inc., and is published under a combination of the Server Side Public License and the Apache License.
     zh_cn: MongoDB 是一个免费且开源的跨平台面向文档的数据库程序。MongoDB 被归类为 NoSQL 数据库程序，它使用具有模式的类似 JSON 的文档。MongoDB 由 MongoDB Inc. 开发，并在 Server Side Public License 和 Apache License 的组合下发布。
@@ -69,7 +70,7 @@ x-casaos:
     pl_pl: MongoDB to darmowy i otwartoźródłowy, wieloplatformowy program bazodanowy zorientowany na dokumenty. MongoDB jest klasyfikowana jako program bazodanowy NoSQL i wykorzystuje dokumenty w formacie JSON z schematami. MongoDB jest rozwijana przez MongoDB Inc. i jest publikowana na zasadach licencji Server Side Public License oraz licencji Apache.
     pt_br: O MongoDB é um programa de banco de dados orientado a documentos, gratuito e de código aberto, multiplataforma. Classificado como um programa de banco de dados NoSQL, o MongoDB utiliza documentos semelhantes a JSON com esquemas. O MongoDB é desenvolvido pela MongoDB Inc. e é publicado sob uma combinação da Licença Pública do Lado do Servidor e da Licença Apache.
   tagline:
-    en_us: A free and open-source cross-platform document-oriented database program. Classified as a NoSQL database program, MongoDB uses JSON-like documents with schemata. 
+    en_us: A free and open-source cross-platform document-oriented database program. Classified as a NoSQL database program, MongoDB uses JSON-like documents with schemata.
     zh_cn: 一个免费且开源的跨平台面向文档的数据库程序。MongoDB 被归类为 NoSQL 数据库程序，它使用具有模式的类似 JSON 的文档。
     ar_sa: برنامج قاعدة بيانات وثائقية عابرة المنصات ومفتوح المصدر ومجاني. يُصنف MongoDB كبرنامج قاعدة بيانات NoSQL، ويستخدم وثائق تشبه JSON مع تخطيطات.
     de_de: Ein kostenloses und Open-Source, plattformübergreifendes, dokumentenorientiertes Datenbankprogramm. MongoDB wird als NoSQL-Datenbankprogramm eingestuft und verwendet JSON-ähnliche Dokumente mit Schemata.
diff --git a/Apps/Mylar3/docker-compose.yml b/Apps/Mylar3/docker-compose.yml
index 054686b9b..2b3776b44 100644
--- a/Apps/Mylar3/docker-compose.yml
+++ b/Apps/Mylar3/docker-compose.yml
@@ -48,6 +48,7 @@ services:
         - container: /downloads
           description:
             en_us: ""
+    container_name: mylar3
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/N8n/docker-compose.yml b/Apps/N8n/docker-compose.yml
index 02612da2e..6bf342313 100644
--- a/Apps/N8n/docker-compose.yml
+++ b/Apps/N8n/docker-compose.yml
@@ -35,6 +35,7 @@ services:
           description:
             en_us: n8n directory.
             zh_cn: n8n 目录。
+    container_name: n8n
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Nextcloud/docker-compose.yml b/Apps/Nextcloud/docker-compose.yml
index d992e62c3..e926cc5e0 100644
--- a/Apps/Nextcloud/docker-compose.yml
+++ b/Apps/Nextcloud/docker-compose.yml
@@ -36,6 +36,7 @@ services:
           description:
             en_us: Nextcloud config directory.
             zh_cn: Nextcloud 配置目录。
+    container_name: nextcloud
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/NginxProxyManager/docker-compose.yml b/Apps/NginxProxyManager/docker-compose.yml
index d7dac8873..a2f2a35bb 100644
--- a/Apps/NginxProxyManager/docker-compose.yml
+++ b/Apps/NginxProxyManager/docker-compose.yml
@@ -51,6 +51,7 @@ services:
           description:
             en_us: Nginx Proxy Manager letsencrypt directory.
             zh_cn: Nginx 代理管理器 letsencrypt 目录。
+    container_name: nginxproxymanager
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Node-RED/docker-compose.yml b/Apps/Node-RED/docker-compose.yml
index 714bbd5f9..d34594823 100644
--- a/Apps/Node-RED/docker-compose.yml
+++ b/Apps/Node-RED/docker-compose.yml
@@ -26,6 +26,7 @@ services:
         - container: /data
           description:
             en_us: ""
+    container_name: node-red
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Nzbget/docker-compose.yml b/Apps/Nzbget/docker-compose.yml
index b1a63967d..a626febfe 100644
--- a/Apps/Nzbget/docker-compose.yml
+++ b/Apps/Nzbget/docker-compose.yml
@@ -54,6 +54,7 @@ services:
         - container: /downloads
           description:
             en_us: ""
+    container_name: nzbget
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Ombi/docker-compose.yml b/Apps/Ombi/docker-compose.yml
index d165fe43c..e318a57bb 100644
--- a/Apps/Ombi/docker-compose.yml
+++ b/Apps/Ombi/docker-compose.yml
@@ -44,6 +44,7 @@ services:
         - container: /config
           description:
             en_us: ""
+    container_name: ombi
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/OpenHAB/docker-compose.yml b/Apps/OpenHAB/docker-compose.yml
index 5be77b753..e1301d65f 100644
--- a/Apps/OpenHAB/docker-compose.yml
+++ b/Apps/OpenHAB/docker-compose.yml
@@ -68,6 +68,7 @@ services:
           description:
             en_us: Location for logs, cache, persistence databases, etc.
             zh_cn: 用于日志，缓存，持久性数据库等的位置。
+    container_name: openhab
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/OpenSpeedTest/docker-compose.yml b/Apps/OpenSpeedTest/docker-compose.yml
index a2530d542..8acbe414c 100644
--- a/Apps/OpenSpeedTest/docker-compose.yml
+++ b/Apps/OpenSpeedTest/docker-compose.yml
@@ -18,6 +18,7 @@ services:
           description:
             en_us: ""
 
+    container_name: openspeedtest
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Overseerr/docker-compose.yml b/Apps/Overseerr/docker-compose.yml
index 143bb1451..be365a294 100644
--- a/Apps/Overseerr/docker-compose.yml
+++ b/Apps/Overseerr/docker-compose.yml
@@ -1,4 +1,4 @@
-name: Overseerr
+name: overseerr
 services:
   overseerr:
     image: linuxserver/overseerr:1.33.0
@@ -70,6 +70,7 @@ services:
       - type: bind
         source: /DATA/AppData/overseerr/config
         target: /config
+    container_name: overseerr
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Petio/docker-compose.yml b/Apps/Petio/docker-compose.yml
index c81162a63..d50465c8b 100644
--- a/Apps/Petio/docker-compose.yml
+++ b/Apps/Petio/docker-compose.yml
@@ -1,4 +1,4 @@
-name: Petio
+name: petio
 services:
   petio:
     image: ghcr.io/petio-team/petio@sha256:1c5a9276a844f4284601cbe332905864950545ebdeaad74bacb9097ea4f4b333
@@ -44,6 +44,7 @@ services:
       - type: bind
         source: /DATA/AppData/petio/logs
         target: /app/logs
+    container_name: petio-petio
   mongo:
     image: mongo:4.4.22
     restart: unless-stopped
@@ -54,6 +55,7 @@ services:
       PUID: $PUID
       PGID: $PGID
       TZ: $TZ
+    container_name: petio-mongo
 networks:
   petio-network:
     driver: bridge
diff --git a/Apps/PhotoPrism/docker-compose.yml b/Apps/PhotoPrism/docker-compose.yml
index cc1d2f2fc..d5497ce2e 100644
--- a/Apps/PhotoPrism/docker-compose.yml
+++ b/Apps/PhotoPrism/docker-compose.yml
@@ -52,6 +52,7 @@ services:
           description:
             en_us: PhotoPrism originals directory.
             zh_cn: PhotoPrism 原始文件目录
+    container_name: photoprism
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Pihole/docker-compose.yml b/Apps/Pihole/docker-compose.yml
index 3784c7982..8baf400fa 100644
--- a/Apps/Pihole/docker-compose.yml
+++ b/Apps/Pihole/docker-compose.yml
@@ -89,6 +89,7 @@ services:
           description:
             en_us: Pi-hole /etc/dnsmasq.d directory.
             zh_cn: Pi-hole /etc/dnsmasq.d 目录
+    container_name: pihole
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Plex/docker-compose.yml b/Apps/Plex/docker-compose.yml
index 347faefa8..8dda427c6 100644
--- a/Apps/Plex/docker-compose.yml
+++ b/Apps/Plex/docker-compose.yml
@@ -46,6 +46,7 @@ services:
           description:
             en_us: Plex Media directory.
             zh_cn: Plex媒体目录
+    container_name: plex
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Portainer/docker-compose.yml b/Apps/Portainer/docker-compose.yml
index b17e2cf64..17d2df4a5 100644
--- a/Apps/Portainer/docker-compose.yml
+++ b/Apps/Portainer/docker-compose.yml
@@ -40,6 +40,7 @@ services:
           description:
             en_us: Portainer data directory
             zh_cn: Portainer 数据目录
+    container_name: portainer
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/PostgreSQL/docker-compose.yml b/Apps/PostgreSQL/docker-compose.yml
index 58e66a24f..0d2b514d6 100644
--- a/Apps/PostgreSQL/docker-compose.yml
+++ b/Apps/PostgreSQL/docker-compose.yml
@@ -46,6 +46,7 @@ services:
       - type: bind
         source: /DATA/AppData/postgresql/data
         target: /var/lib/postgresql/data
+    container_name: postgresql
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Prowlarr/docker-compose.yml b/Apps/Prowlarr/docker-compose.yml
index f95038261..1a2b27ff9 100644
--- a/Apps/Prowlarr/docker-compose.yml
+++ b/Apps/Prowlarr/docker-compose.yml
@@ -40,6 +40,7 @@ services:
         - container: /config
           description:
             en_us: ""
+    container_name: prowlarr
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Radarr/docker-compose.yml b/Apps/Radarr/docker-compose.yml
index b031cad11..53a373ffb 100644
--- a/Apps/Radarr/docker-compose.yml
+++ b/Apps/Radarr/docker-compose.yml
@@ -59,6 +59,7 @@ services:
           description:
             en_us: Radarr downloads directory.
             zh_cn: Radarr下载目录
+    container_name: radarr
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Readarr/docker-compose.yml b/Apps/Readarr/docker-compose.yml
index de65a6866..1356f0376 100644
--- a/Apps/Readarr/docker-compose.yml
+++ b/Apps/Readarr/docker-compose.yml
@@ -52,6 +52,7 @@ services:
         - container: /downloads
           description:
             en_us: ""
+    container_name: readarr
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Resilio-sync/docker-compose.yml b/Apps/Resilio-sync/docker-compose.yml
index 0a34ee8d4..c08562633 100644
--- a/Apps/Resilio-sync/docker-compose.yml
+++ b/Apps/Resilio-sync/docker-compose.yml
@@ -26,6 +26,7 @@ services:
         source: /DATA/Downloads
         target: /downloads
     privileged: false
+    container_name: resilio-sync
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Sabnzbd/docker-compose.yml b/Apps/Sabnzbd/docker-compose.yml
index 1cfa17078..6a0d1e48e 100644
--- a/Apps/Sabnzbd/docker-compose.yml
+++ b/Apps/Sabnzbd/docker-compose.yml
@@ -52,6 +52,7 @@ services:
         - container: /downloads
           description:
             en_us: ""
+    container_name: sabnzbd
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Sickchill/docker-compose.yml b/Apps/Sickchill/docker-compose.yml
index 612f29d61..bdd829452 100644
--- a/Apps/Sickchill/docker-compose.yml
+++ b/Apps/Sickchill/docker-compose.yml
@@ -52,6 +52,7 @@ services:
         - container: /tv
           description:
             en_us: ""
+    container_name: sickchill
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Smokeping/docker-compose.yml b/Apps/Smokeping/docker-compose.yml
index 9c7a57470..67ede954d 100644
--- a/Apps/Smokeping/docker-compose.yml
+++ b/Apps/Smokeping/docker-compose.yml
@@ -46,6 +46,7 @@ services:
         - container: /data
           description:
             en_us: ""
+    container_name: smokeping
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Snapdrop/docker-compose.yml b/Apps/Snapdrop/docker-compose.yml
index ef019e1e8..0e683dda4 100644
--- a/Apps/Snapdrop/docker-compose.yml
+++ b/Apps/Snapdrop/docker-compose.yml
@@ -20,6 +20,7 @@ services:
         source: /DATA/AppData/$AppID/config
         target: /config
     privileged: false
+    container_name: snapdrop
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Sonarr/docker-compose.yml b/Apps/Sonarr/docker-compose.yml
index 26718f1ec..74b2622fb 100644
--- a/Apps/Sonarr/docker-compose.yml
+++ b/Apps/Sonarr/docker-compose.yml
@@ -59,6 +59,7 @@ services:
           description:
             en_us: Sonarr downloads directory.
             zh_cn: Sonarr下载目录
+    container_name: sonarr
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Stash/docker-compose.yml b/Apps/Stash/docker-compose.yml
index 912b75c50..e00370ce1 100644
--- a/Apps/Stash/docker-compose.yml
+++ b/Apps/Stash/docker-compose.yml
@@ -1,7 +1,6 @@
----
 name: stash
 services:
-  app:
+  stash:
     image: stashapp/stash:v0.21.0
     restart: unless-stopped
     environment:
@@ -99,12 +98,13 @@ services:
       - /DATA/AppData/$AppID/userscripts:/userscripts
       - /DATA/AppData/$AppID/validator:/validator
       - /DATA/Media/xxx:/media
+    container_name: stash
 x-casaos:
   architectures:
     - amd64
     - arm
     - arm64
-  main: app
+  main: stash
   author: f4bio
   description:
     en_us: "Stash allows you to organize and view your own collection of adult video and image files. Think of it like a private PornHub site for your personal porn collection. Documentation: https://docs.stashapp.cc"
diff --git a/Apps/Syncthing/docker-compose.yml b/Apps/Syncthing/docker-compose.yml
index 95eca7307..4e443981c 100644
--- a/Apps/Syncthing/docker-compose.yml
+++ b/Apps/Syncthing/docker-compose.yml
@@ -77,6 +77,7 @@ services:
           description:
             en_us: Syncthing Accessible Directory.
             zh_cn: Syncthing可访问目录
+    container_name: syncthing
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Tautulli/docker-compose.yml b/Apps/Tautulli/docker-compose.yml
index bae5b3491..6dbf5b8cf 100644
--- a/Apps/Tautulli/docker-compose.yml
+++ b/Apps/Tautulli/docker-compose.yml
@@ -40,6 +40,7 @@ services:
         - container: /config
           description:
             en_us: ""
+    container_name: tautulli
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Transmission/docker-compose.yml b/Apps/Transmission/docker-compose.yml
index 50d4665dd..00188b268 100644
--- a/Apps/Transmission/docker-compose.yml
+++ b/Apps/Transmission/docker-compose.yml
@@ -83,6 +83,7 @@ services:
         - container: /watch
           description:
             en_us: ""
+    container_name: transmission
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Unifi-controller/docker-compose.yml b/Apps/Unifi-controller/docker-compose.yml
index ee2e4ba28..03f2b672f 100644
--- a/Apps/Unifi-controller/docker-compose.yml
+++ b/Apps/Unifi-controller/docker-compose.yml
@@ -101,6 +101,7 @@ services:
         - container: /config
           description:
             en_us: ""
+    container_name: unifi-controller
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/UptimeKuma/docker-compose.yml b/Apps/UptimeKuma/docker-compose.yml
index 0bc30d250..fe2dc3cf9 100644
--- a/Apps/UptimeKuma/docker-compose.yml
+++ b/Apps/UptimeKuma/docker-compose.yml
@@ -28,6 +28,7 @@ services:
           description:
             en_us: Uptime Kuma data directory.
             zh_cn: Uptime Kuma 数据目录。
+    container_name: uptimekuma
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/Vaultwarden/docker-compose.yml b/Apps/Vaultwarden/docker-compose.yml
index c220e0c78..36cc91330 100644
--- a/Apps/Vaultwarden/docker-compose.yml
+++ b/Apps/Vaultwarden/docker-compose.yml
@@ -28,6 +28,7 @@ services:
           description:
             en_us: Vaultwarden data directory.
             zh_cn: Vaultwarden 数据目录。
+    container_name: vaultwarden
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/VoceChat/docker-compose.yml b/Apps/VoceChat/docker-compose.yml
index e7decee75..5b169d659 100644
--- a/Apps/VoceChat/docker-compose.yml
+++ b/Apps/VoceChat/docker-compose.yml
@@ -34,6 +34,7 @@ services:
           description:
             en_us: VoceChat Data
             zh_cn: VoceChat 数据
+    container_name: vocechat
 x-casaos:
   architectures:
     - amd64
diff --git a/Apps/qBittorrent/docker-compose.yml b/Apps/qBittorrent/docker-compose.yml
index 6ec38fd31..70f5546d4 100644
--- a/Apps/qBittorrent/docker-compose.yml
+++ b/Apps/qBittorrent/docker-compose.yml
@@ -57,6 +57,7 @@ services:
           description:
             en_us: qBittorrent Accessible directory.
             zh_cn: qBittorrent 可访问目录。
+    container_name: qbittorrent
 x-casaos:
   architectures:
     - amd64