diff --git a/Dockerfile b/Dockerfile
index c41df8c73..4d18a99ab 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1
-FROM node:20.9-slim AS base
+FROM node:20.16.0-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
+RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app
diff --git a/Dockerfile.cloud b/Dockerfile.cloud
index c234259dc..8e4bac215 100644
--- a/Dockerfile.cloud
+++ b/Dockerfile.cloud
@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1
-FROM node:20.9-slim AS base
+FROM node:20.16.0-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
+RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app
diff --git a/Dockerfile.schedule b/Dockerfile.schedule
index 70976523c..ecb125e09 100644
--- a/Dockerfile.schedule
+++ b/Dockerfile.schedule
@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1
-FROM node:20.9-slim AS base
+FROM node:20.16.0-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
+RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app
diff --git a/Dockerfile.server b/Dockerfile.server
index e911c8780..ea6b372e8 100644
--- a/Dockerfile.server
+++ b/Dockerfile.server
@@ -1,8 +1,9 @@
 # syntax=docker/dockerfile:1
-FROM node:20.9-slim AS base
+FROM node:20.16.0-slim AS base
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 RUN corepack enable
+RUN corepack prepare pnpm@9.12.0 --activate
 
 FROM base AS build
 COPY . /usr/src/app
diff --git a/packages/server/src/setup/monitoring-setup.ts b/packages/server/src/setup/monitoring-setup.ts
index 8427d6486..a99098fc9 100644
--- a/packages/server/src/setup/monitoring-setup.ts
+++ b/packages/server/src/setup/monitoring-setup.ts
@@ -30,6 +30,9 @@ export const setupMonitoring = async (serverId: string) => {
 			// PidMode: "host",
 			// CapAdd: ["NET_ADMIN", "SYS_ADMIN"],
 			// Privileged: true,
+			RestartPolicy: {
+				Name: "always",
+			},
 			PortBindings: {
 				[`${server.metricsConfig.server.port}/tcp`]: [
 					{
@@ -103,6 +106,9 @@ export const setupWebMonitoring = async () => {
 			// PidMode: "host",
 			// CapAdd: ["NET_ADMIN", "SYS_ADMIN"],
 			// Privileged: true,
+			RestartPolicy: {
+				Name: "always",
+			},
 			PortBindings: {
 				[`${webServer?.metricsConfig?.server?.port}/tcp`]: [
 					{