diff --git a/.env.docker b/.env.docker
index 05995d5b..530514bf 100644
--- a/.env.docker
+++ b/.env.docker
@@ -3,8 +3,6 @@
 ## Please note that the LinkAce Docker image will be renamed with the release of LinkAce 2!
 ## Read more: https://github.com/Kovah/LinkAce/issues/502
 
-## Basic app configuration
-COMPOSE_PROJECT_NAME=linkace
 # The environment is usually 'production' but may be changed to 'local' for development
 APP_ENV=local
 # The app key is generated later, please leave it like that
diff --git a/.env.docker.production b/.env.docker.production
index a1f52c5f..f410b3c5 100644
--- a/.env.docker.production
+++ b/.env.docker.production
@@ -1,10 +1,5 @@
 ## LINKACE CONFIGURATION
 
-## Please note that the LinkAce Docker image will be renamed with the release of LinkAce 2!
-## Read more: https://github.com/Kovah/LinkAce/issues/502
-
-## Basic app configuration
-COMPOSE_PROJECT_NAME=linkace
 # The app key is generated later, please leave it like that
 APP_KEY=someRandomStringWith32Characters
 
diff --git a/docker-compose.production.yml b/docker-compose.production.yml
index f63f68f7..8ca2f6d0 100644
--- a/docker-compose.production.yml
+++ b/docker-compose.production.yml
@@ -1,20 +1,6 @@
 ---
 services:
-
-  # --- MariaDB
-  db:
-    image: docker.io/library/mariadb:11.5
-    restart: unless-stopped
-    command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
-    environment:
-      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
-      - MYSQL_USER=${DB_USERNAME}
-      - MYSQL_PASSWORD=${DB_PASSWORD}
-      - MYSQL_DATABASE=${DB_DATABASE}
-    volumes:
-      - db:/var/lib/mysql
-
-  # --- LinkAce Image with PHP
+  # --- LinkAce
   app:
     image: docker.io/linkace/linkace:latest
     restart: unless-stopped
@@ -27,13 +13,24 @@ services:
     volumes:
       - ./.env:/app/.env
       - ./backups:/app/storage/app/backups
-      - linkace_app:/app
-      - linkace_logs:/app/storage/logs
       # Remove the hash of the following line if you want to use HTTPS for this container
       #- ./Caddyfile:/etc/caddy/Caddyfile:ro
       #- ./caddy-data:/data/caddy
 
-  # --- Redis
+  # --- Database
+  db:
+    image: docker.io/library/mariadb:11.5
+    restart: unless-stopped
+    command: mariadbd --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
+    environment:
+      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+      - MYSQL_USER=${DB_USERNAME}
+      - MYSQL_PASSWORD=${DB_PASSWORD}
+      - MYSQL_DATABASE=${DB_DATABASE}
+    volumes:
+      - db:/var/lib/mysql
+
+  # --- Cache
   redis:
     image: docker.io/bitnami/redis:7.4
     restart: unless-stopped
@@ -41,7 +38,4 @@ services:
       - REDIS_PASSWORD=${REDIS_PASSWORD}
 
 volumes:
-  linkace_app:
-  linkace_logs:
   db:
-    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b0393ef..e267aa3a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,5 @@
 ---
+name: linkace_dev
 services:
 
   # --- MariaDB