diff --git a/.Dockerfile b/.Dockerfile
deleted file mode 100644
index 60ecf45a5..000000000
--- a/.Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM oven/bun:latest as build
-
-WORKDIR /app
-
-COPY package.json bun.lockb ./
-RUN bun install
-
-COPY . .
-
-RUN bun run build
-
-FROM nginx:alpine
-
-COPY --from=build /app/dist /usr/share/nginx/html
-
-EXPOSE 80
-
-CMD ["nginx", "-g", "daemon off;"]
-
-## docker build -t angular-bun-app .
-## docker run -p 80:80 angular-bun-app
-
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..9467be2d5
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,26 @@
+# Build
+FROM node:22-alpine AS build
+
+WORKDIR /app
+
+COPY package.json ./
+RUN npm install
+
+COPY . .
+
+RUN npm link @angular/cli
+RUN ng build --verbose
+
+# Dist
+FROM node:22-alpine AS dist
+
+WORKDIR /code
+
+COPY --from=build /app/dist /code/dist
+
+# Dev
+FROM build AS dev
+
+EXPOSE 4200
+
+CMD ["ng", "serve"]
diff --git a/package.json b/package.json
index 6de527dff..f262d7b72 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
   "private": true,
   "dependencies": {
     "@angular/cdk": "^19.2.1",
+    "@angular/cli": "^19.2.0",
     "@angular/common": "^19.2.0",
     "@angular/compiler": "^19.2.0",
     "@angular/core": "^19.2.0",