diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..69b5ef2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea/
+data/
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c42d7e..7e5a8c8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,33 +1,11 @@
 services:
-  rustfs:
-    image: rustfs/rustfs:latest
-    container_name: rustfs
-    ports:
-      - "9000:9000"
-      - "9001:9001"
-    environment:
-      - RUSTFS_VOLUMES=/data/rustfs0
-      - RUSTFS_ADDRESS=0.0.0.0:9000
-      - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001
-      - RUSTFS_ACCESS_KEY=vadim
-      - RUSTFS_SECRET_KEY=!0218kiriLL
-      - RUSTFS_CONSOLE_ENABLE=true
-      - RUSTFS_CORS_ALLOWED_ORIGINS=*
-      - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=*
-      - RUSTFS_OBS_LOGGER_LEVEL=info
-      - RUSTFS_OBJECT_CACHE_ENABLE=true
-      - RUSTFS_OBJECT_CACHE_TTL_SECS=300
-    volumes:
-      - rustfs_data_0:/data/rustfs0
-      - ./rustfs/logs:/app/logs
-    restart: unless-stopped
   message:
     image: git.madsky.ru/lotti/message:latest
     container_name: message
     ports:
       - "8070:8070"
     volumes:
-      - ./message/config.yml:/app/config.yml
+      - ./data/message/config.yml:/app/config.yml
     restart: unless-stopped
   tracker:
     image: git.madsky.ru/vadim/tracker:latest
@@ -35,7 +13,7 @@ services:
     ports:
       - "3300:3000"
     volumes:
-      - ./tracker/config.yaml:/app/config.yaml
+      - ./data/tracker/config.yaml:/app/config.yaml
     restart: unless-stopped
   nats:
     image: nats
@@ -47,8 +25,8 @@ services:
       - "6222:6222"
       - "8222:8222"
     volumes:
-      - ./nats.conf:/etc/nats/nats.conf
-      - ./nats:/data
+      - ./data/nats.conf:/etc/nats/nats.conf
+      - ./data/nats:/data
   redis:
     image: redis:latest
     container_name: redis
@@ -57,14 +35,14 @@ services:
       - "6379:6379"
     command: ["redis-server", "--save", "60 1", "--loglevel", "warning"]
     volumes:
-      - ./redis:/data
+      - ./data/redis:/data
   homebridge:
     image: homebridge/homebridge:latest
     container_name: homebridge
     restart: unless-stopped
     network_mode: host
     volumes:
-      - ./homebridge:/homebridge
+      - ./data/homebridge:/homebridge
     logging:
       driver: json-file
       options:
@@ -83,14 +61,14 @@ services:
     ports:
       - "1883:1883"
     volumes:
-      - ./mosquitto/config:/mosquitto/config
+      - ./data/mosquitto/config:/mosquitto/config
   postgres:
     image: postgres:17.6-alpine
     container_name: postgres
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-postgres}
     volumes:
-      - ./postgres:/var/lib/postgresql/data
+      - ./data/postgres:/var/lib/postgresql/data
     ports:
       - "5432:5432"
     restart: unless-stopped
@@ -107,7 +85,7 @@ services:
       - GITEA__database__PASSWD=postgres
     restart: unless-stopped
     volumes:
-      - ./gitea:/data
+      - ./data/gitea:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     ports:
@@ -115,17 +93,23 @@ services:
       - "2222:22"
     depends_on:
       - postgres
-  volume-permission-helper:
-    image: alpine
+  rustfs:
+    image: rustfs/rustfs:latest
+    container_name: rustfs
+    ports:
+      - "9000:9000"
+      - "9001:9001"
+    environment:
+      - RUSTFS_ADDRESS=0.0.0.0:9000
+      - RUSTFS_CONSOLE_ADDRESS=0.0.0.0:9001
+      - RUSTFS_ACCESS_KEY=vadim
+      - RUSTFS_SECRET_KEY=!0218kiriLL
+      - RUSTFS_CONSOLE_ENABLE=true
+      - RUSTFS_CORS_ALLOWED_ORIGINS=*
+      - RUSTFS_CONSOLE_CORS_ALLOWED_ORIGINS=*
+      - RUSTFS_OBS_LOGGER_LEVEL=info
+      - RUSTFS_OBJECT_CACHE_ENABLE=true
+      - RUSTFS_OBJECT_CACHE_TTL_SECS=300
     volumes:
-      - rustfs_data_0:/data0
-    command: >
-      sh -c "
-        chown -R 10001:10001 /data0 /data1 /data2 /data3 /logs &&
-        echo 'Volume Permissions fixed' &&
-        exit 0
-      "
-    restart: "no"
-
-volumes:
-  rustfs_data_0:
\ No newline at end of file
+      - ./data/rustfs/fs:/data/
+    restart: unless-stopped
\ No newline at end of file