diff --git a/docker-compose.yml b/docker-compose.yml
index 2ec712a..489c450 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
   backend:
     build:
       context: ./backend
-      dockerfile: ../docker/backend/Dockerfile
+      dockerfile: Dockerfile
     container_name: support-backend
     restart: unless-stopped
     environment:
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 18ddde1..406d4c7 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -2,12 +2,12 @@ FROM node:18-alpine as build
 
 WORKDIR /app
 
-# Copy package files
-COPY package*.json ./
+# Copy package files from frontend directory
+COPY frontend/package*.json ./
 RUN npm install
 
-# Copy source code
-COPY . .
+# Copy frontend source code
+COPY frontend/ .
 
 # Build the app
 RUN npm run build
@@ -21,7 +21,7 @@ COPY --from=build /app/dist /usr/share/nginx/html
 RUN mkdir -p /etc/nginx/conf.d
 
 # Copy nginx configuration
-COPY ../docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
 
 # Create required directories and set permissions
 RUN mkdir -p /var/cache/nginx \