diff --git a/docker-compose.yml b/docker-compose.yml
index 16c3b46..6ba05bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,11 +6,10 @@ services:
       context: .
       dockerfile: docker/frontend/Dockerfile
     container_name: support-frontend
-    restart: unless-stopped
+    volumes:
+      - frontend_build:/app/dist
     networks:
       - app-network
-    depends_on:
-      - backend
 
   backend:
     build:
@@ -21,7 +20,7 @@ services:
       - TELEGRAM_BOT_TOKEN=7677506032:AAHEqNUr1lIUfNVbLwaWIaPeKKShsCyz3eo
       - TELEGRAM_CHAT_ID=-1002037023574
     ports:
-      - "8000:8000"  # Добавляем это
+      - "8000:8000"
     volumes:
       - ./backend:/app
       - sqlite_data:/app/instance
@@ -36,6 +35,8 @@ services:
     restart: unless-stopped
     ports:
       - "80:80"
+    volumes:
+      - frontend_build:/usr/share/nginx/html
     networks:
       - app-network
     depends_on:
@@ -47,4 +48,5 @@ networks:
     driver: bridge
 
 volumes:
-  sqlite_data:
\ No newline at end of file
+  sqlite_data:
+  frontend_build:
\ No newline at end of file
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 1644b75..e668995 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -1,5 +1,4 @@
-# Build stage
-FROM node:18-alpine as build
+FROM node:18-alpine
 
 WORKDIR /app
 
@@ -15,12 +14,5 @@ COPY frontend/ ./
 # Собираем приложение
 RUN npm run build
 
-# Production stage
-FROM nginx:alpine
-
-# Копируем собранные файлы
-COPY --from=build /app/dist /usr/share/nginx/html/
-
-EXPOSE 80
-
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+# Держим контейнер запущенным
+CMD ["tail", "-f", "/dev/null"]
\ No newline at end of file
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
index 046d742..53005fe 100644
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@@ -1,8 +1,14 @@
 FROM nginx:alpine
 
-COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
+# Копируем конфигурацию nginx
 COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
+# Копируем собранные файлы фронтенда
+COPY frontend/dist /usr/share/nginx/html/
+
+# Удаляем дефолтную страницу nginx
+RUN rm -rf /usr/share/nginx/html/50x.html
+
 EXPOSE 80
 
 CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file