diff --git a/backend/services/admin-service/Dockerfile b/backend/services/admin-service/Dockerfile
index 4e083f6..be8fa76 100644
--- a/backend/services/admin-service/Dockerfile
+++ b/backend/services/admin-service/Dockerfile
@@ -1,7 +1,16 @@
-FROM node:20-alpine
+FROM node:20-alpine AS builder
 WORKDIR /app
 COPY package*.json ./
-RUN npm ci --only=production
-COPY dist/ ./dist/
+RUN npm ci
+COPY . .
+RUN npm run build
+
+FROM node:20-alpine
+WORKDIR /app
+RUN apk add --no-cache dumb-init
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./
+USER node
 EXPOSE 3012
-CMD ["node", "dist/main"]
+CMD ["dumb-init", "node", "dist/main"]
diff --git a/backend/services/telemetry-service/Dockerfile b/backend/services/telemetry-service/Dockerfile
index 1ee2547..fa0b6bf 100644
--- a/backend/services/telemetry-service/Dockerfile
+++ b/backend/services/telemetry-service/Dockerfile
@@ -1,7 +1,16 @@
-FROM node:20-alpine
+FROM node:20-alpine AS builder
 WORKDIR /app
 COPY package*.json ./
-RUN npm ci --only=production
-COPY dist/ ./dist/
+RUN npm ci
+COPY . .
+RUN npm run build
+
+FROM node:20-alpine
+WORKDIR /app
+RUN apk add --no-cache dumb-init
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/package.json ./
+USER node
 EXPOSE 3011
-CMD ["node", "dist/main"]
+CMD ["dumb-init", "node", "dist/main"]