diff --git a/idp/Dockerfile b/idp/Dockerfile
index fa4f6de82..674e19f20 100644
--- a/idp/Dockerfile
+++ b/idp/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22-alpine
+FROM oven/bun:1-alpine
 
 WORKDIR /app
 
@@ -6,11 +6,11 @@ COPY src ./src
 COPY templates ./templates
 COPY .env .
 COPY package.json .
-COPY package-lock.json .
+COPY bun.lockb .
 COPY tsconfig.json .
 
-RUN npm ci --legacy-peer-deps
+RUN bun install --frozen-lockfile
 
-ENTRYPOINT ["npm", "run", "start"]
+ENTRYPOINT ["bun", "run", "start"]
 
 EXPOSE 8081
diff --git a/idp/package.json b/idp/package.json
index 9852dc8c0..4db46708c 100644
--- a/idp/package.json
+++ b/idp/package.json
@@ -11,9 +11,6 @@
     "swagger-autogen": "node ./swagger.js",
     "lint": "eslint"
   },
-  "engines": {
-    "node": "22.x"
-  },
   "dependencies": {
     "body-parser": "1.20.2",
     "camelize": "1.0.1",
diff --git a/ui/Dockerfile b/ui/Dockerfile
index 994dc4120..326aaf351 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:22-alpine AS ui-builder
+FROM oven/bun:1-alpine AS ui-builder
 
 WORKDIR /build
 
@@ -9,12 +9,12 @@ COPY postcss.config.cjs .
 COPY tailwind.config.cjs .
 COPY vite.config.ts .
 COPY package.json .
-COPY package-lock.json .
+COPY bun.lockb .
 COPY tsconfig.json .
 COPY tsconfig.node.json .
 
-RUN npm ci --legacy-peer-deps
-RUN npm run build
+RUN bun install --frozen-lockfile
+RUN bun run build
 
 FROM golang:1.22-alpine AS go-builder
 
@@ -29,10 +29,7 @@ COPY go.sum .
 RUN go mod download
 RUN go build -o voltaserve-ui
 
-FROM ubuntu:noble AS runner
-
-RUN apt-get update
-RUN apt-get install -y curl
+FROM alpine:3.20 AS runner
 
 WORKDIR /app
 
diff --git a/webdav/Dockerfile b/webdav/Dockerfile
index c80c6922b..309b715b8 100644
--- a/webdav/Dockerfile
+++ b/webdav/Dockerfile
@@ -1,15 +1,15 @@
-FROM node:22-alpine
+FROM oven/bun:1-alpine
 
 WORKDIR /app
 
 COPY src ./src
 COPY .env .
 COPY package.json .
-COPY package-lock.json .
+COPY bun.lockb .
 COPY tsconfig.json .
 
-RUN npm ci --legacy-peer-deps
+RUN bun install --frozen-lockfile
 
-ENTRYPOINT ["npm", "run", "start"]
+ENTRYPOINT ["bun", "run", "start"]
 
 EXPOSE 8082
diff --git a/webdav/package.json b/webdav/package.json
index ef8bbeae4..848bc0bcb 100644
--- a/webdav/package.json
+++ b/webdav/package.json
@@ -10,9 +10,6 @@
     "format": "prettier --write .",
     "lint": "eslint"
   },
-  "engines": {
-    "node": "22.x"
-  },
   "dependencies": {
     "dotenv": "16.4.5",
     "passport": "0.7.0",