diff --git a/docker-compose.yml b/docker-compose.yml
index 2beeb19..b569e00 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,43 +1,68 @@
 services:
-  mariadb:
-    image: mariadb:10.11
-    container_name: admin-mariadb
+  db:
+    image: mariadb:12.2.2
+    container_name: mariadb
+    restart: unless-stopped
+    user: "1000:1000"
+    environment:
+      PGID: 1000
+      PUID: 1000
+      MARIADB_ROOT_PASSWORD: DVjXT_kew508
+      MARIADB_DATABASE: app_db
+      MARIADB_USER: app_user
+      MARIADB_PASSWORD: app_pass
+      TZ: Europe/Moscow
+#    ports:
+#      - "3306:3306"
+    volumes:
+      - $PWD/mariadb:/var/lib/mysql
+      - /etc/localtime:/etc/localtime:ro
+
+  pma:
+    image: phpmyadmin:5.2.3
+    container_name: phpmyadmin
+    depends_on:
+      - db
     restart: unless-stopped
     environment:
-      MARIADB_ROOT_PASSWORD: rootpass
-      MARIADB_DATABASE: admin_db
-      MARIADB_USER: admin_user
-      MARIADB_PASSWORD: admin_pass
+      PMA_HOST: db
+      PMA_PORT: 3306
+      UPLOAD_LIMIT: 10M
+      PMA_ABSOLUTE_URI: https://phpmyadmin.dev.xserver.su/
+      TZ: Europe/Moscow
     ports:
-      - "3306:3306"
-    volumes:
-      - mariadb_data:/var/lib/mysql
+      - "7102:80"
 
   redis:
-    image: redis:7-alpine
-    container_name: admin-redis
+    image: redis:latest
+    container_name: redis
     restart: unless-stopped
-    ports:
-      - "6379:6379"
+    user: "1000:1000"
+    environment:
+      PGID: 1000
+      PUID: 1000
+      TZ: Europe/Moscow
+#    ports:
+#      - "6379:6379"
+    volumes:
+      - $PWD/redis:/data
+      - /etc/localtime:/etc/localtime:ro
 
   app:
     build: .
     container_name: iiko-app
     restart: unless-stopped
     ports:
-      - "8080:8080"
+      - "7104:8080"
     depends_on:
-      - mariadb
+      - db
       - redis
     environment:
-      DB_HOST: phpmyadmin.xserver.su
+      DB_HOST: db
       DB_PORT: 3306
-      DB_NAME: test
-      DB_USER: test
-      DB_PASSWORD: test
+      DB_NAME: app_db
+      DB_USER: app_user
+      DB_PASSWORD: app_pass
       REDIS_HOST: redis
       REDIS_PORT: 6379
       HTTP_PORT: 8080
-
-volumes:
-  mariadb_data: