diff --git a/Docker/bookstack/.env b/Docker/bookstack/.env
index ca86270..a593092 100644
--- a/Docker/bookstack/.env
+++ b/Docker/bookstack/.env
@@ -1,14 +1,14 @@
 # Password for bookstack MySQL user
-DB_PASS=<your_strong_pass>
+DB_USER_PASS=<your_strong_pass>
 
 # Password for root MySQL user
 DB_ROOT_PASS=<your_strongest_pass>
 
 # Directory, where the bookstack itself will store the files
-CONFIG_PATH=/path/to/bookstack/config
+PATH_TO_CONFIG=/path/to/bookstack/config
 
 # Directory, where MySQL data will be stored
-DB_DATA=/path/to/db/data
+PATH_TO_DB=/path/to/db/data
 
 # Your timezone
 TZ=Europe/Warsaw
diff --git a/Docker/bookstack/compose.yaml b/Docker/bookstack/docker-compose.yaml
similarity index 66%
rename from Docker/bookstack/compose.yaml
rename to Docker/bookstack/docker-compose.yaml
index ca178a7..7327d19 100644
--- a/Docker/bookstack/compose.yaml
+++ b/Docker/bookstack/docker-compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2"
 services:
   bookstack:
     image: lscr.io/linuxserver/bookstack
@@ -11,20 +9,19 @@ services:
       - DB_HOST=bookstack_db
       - DB_PORT=3306
       - DB_USER=bookstack
-      - DB_PASS=${DB_PASS}
+      - DB_PASS=${DB_USER_PASS}
       - DB_DATABASE=bookstackapp
     volumes:
-      - ${CONFIG_PATH}:/config
+      - ${PATH_TO_CONFIG}:/config
     ports:
       - 6875:80
     restart: unless-stopped
-    env_file:
-      - stack.env
     depends_on:
-      - bookstack_db
-  bookstack_db:
+      - bookstack_database
+ 
+  bookstack_database:
     image: lscr.io/linuxserver/mariadb
-    container_name: bookstack_db
+    container_name: bookstack_database
     environment:
       - PUID=1000
       - PGID=1000
@@ -32,9 +29,7 @@ services:
       - TZ=${TZ}
       - MYSQL_DATABASE=bookstackapp
       - MYSQL_USER=bookstack
-      - MYSQL_PASSWORD=${DB_PASS}
+      - MYSQL_PASSWORD=${DB_USER_PASS}
     volumes:
-      - ${DB_DATA}:/config
-    restart: unless-stopped
-    env_file:
-      - stack.env
\ No newline at end of file
+      - ${PATH_TO_DB}:/config
+    restart: unless-stopped
\ No newline at end of file