diff --git a/.gitignore b/.gitignore
index a0c6a45d1b5bc954b317d4b5929494700e77d926..9c1465018ff8af839f8a4f7da3e7f024d6496f48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,15 @@
+# Next.js build output
+.next
+out/
+
+# Node modules
 node_modules/
-.env
-dist/
-*.log
\ No newline at end of file
+
+# Environment variables
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# Logs
+*.log
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..f670025e6e84d25dd6e3fba8a2f96292b8cb9960
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,23 @@
+# Use an official Node.js runtime as a parent image
+FROM node:16-alpine
+
+# Set the working directory in the container
+WORKDIR /app
+
+# Copy package.json and package-lock.json (or yarn.lock) into the container
+COPY package*.json ./
+
+# Install dependencies
+RUN npm install
+
+# Copy the rest of your app's source code
+COPY . .
+
+# Build your Next.js app
+RUN npm run build
+
+# Expose port 3000 to the outside once the container is running
+EXPOSE 3000
+
+# Define the command to run your app using npm start script
+CMD ["npm", "start"]
diff --git a/docker/Dockerfile/docker-compose.yml b/docker/Dockerfile/docker-compose.yml
deleted file mode 100644
index 860617ae8a65ffe1fe9d1d5f7075a49b10dad701..0000000000000000000000000000000000000000
--- a/docker/Dockerfile/docker-compose.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: '3.8'
-services:
-  web:
-    image: node:14
-    volumes:
-      - ./:/usr/src/app
-    working_dir: /usr/src/app
-    command: npm start
-    ports:
-      - "3000:3000"
-    environment:
-      NODE_ENV: development
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b8930a2a668711a82adba8d100a603a0d294c316
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '3.8'
+services:
+  web:
+    build: .
+    ports:
+      - '3000:3000'
+    volumes:
+      - .:/app
+      - /app/node_modules
+    environment:
+      - NODE_ENV=development
+    command: npm run dev