diff --git a/.env.example b/.env.example
index 75ed64d..1a505d2 100644
--- a/.env.example
+++ b/.env.example
@@ -1,3 +1,2 @@
 PORT=5500
-HMR_PORT=5501
-NODE_ENV=development
\ No newline at end of file
+HMR_PORT=5501
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..c80bf34
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,15 @@
+FROM oven/bun:alpine
+
+WORKDIR /app
+
+COPY ./app/package.json ./app/bun.lock ./
+
+RUN bun install --frozen-lockfile
+
+COPY ./app /app
+
+RUN bun run build
+
+EXPOSE 3000
+
+CMD [ "pnpm", "preview" ]
\ No newline at end of file
diff --git a/buildForProduction.sh b/buildForProduction.sh
new file mode 100644
index 0000000..e69de29
diff --git a/compose.prod.yml b/compose.prod.yml
new file mode 100644
index 0000000..d3572ac
--- /dev/null
+++ b/compose.prod.yml
@@ -0,0 +1,15 @@
+services:
+  memento:
+    container_name: memento-prod
+    build:
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+      - .env
+    environment:
+      - NODE_ENV=development
+    ports:
+      - "${PORT}:${PORT}"
+      - "${HMR_PORT}:${HMR_PORT}"
+    working_dir: /app
+    command: bun run preview
diff --git a/compose.yml b/compose.yml
index fc7c3d1..b27dcfb 100644
--- a/compose.yml
+++ b/compose.yml
@@ -1,9 +1,11 @@
 services:
-  dev:
+  memento:
     container_name: memento-dev
     image: oven/bun:alpine
     env_file:
       - .env
+    environment:
+      - NODE_ENV=development
     ports:
       - "${PORT}:${PORT}"
       - "${HMR_PORT}:${HMR_PORT}"
@@ -11,16 +13,3 @@ services:
       - ./app:/app
     working_dir: /app
     command: bun run dev
-
-  prod:
-    container_name: memento-prod
-    image: oven/bun:alpine
-    env_file:
-      - .env
-    ports:
-      - "${PORT}:${PORT}"
-      - "${HMR_PORT}:${HMR_PORT}"
-    volumes:
-      - ./app:/app
-    working_dir: /app
-    command: bun run production
diff --git a/pnpm.Dockerfile b/pnpm.Dockerfile
deleted file mode 100644
index efc3e9a..0000000
--- a/pnpm.Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM node:22-alpine
-
-WORKDIR /app
-
-# COPY ./app/package.json ./app/pnpm-lock.yaml /app/
-
-RUN mkdir -p /app
-RUN npm install -g pnpm
-
-RUN chmod -R 775 /app
-
-EXPOSE 3000
-
-ENTRYPOINT [ "pnpm" ]
-CMD [ "pnpm", "dev" ]
\ No newline at end of file
diff --git a/production.Dockerfile b/production.Dockerfile
deleted file mode 100644
index dd70937..0000000
--- a/production.Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM node:22-alpine
-
-WORKDIR /app
-
-RUN npm install -g pnpm
-
-COPY ./app/package.json ./app/pnpm-lock.yaml ./
-
-RUN pnpm install --frozen-lockfile --prod false
-
-COPY ./app /app
-
-RUN pnpm build
-
-EXPOSE 3000
-
-CMD [ "pnpm", "preview" ]
\ No newline at end of file