diff --git a/apps/cli/Dockerfile b/apps/cli/Dockerfile
index d2ee8d3..d52c9d3 100644
--- a/apps/cli/Dockerfile
+++ b/apps/cli/Dockerfile
@@ -1,22 +1,22 @@
-FROM node:20.2-alpine3.18 as unteris-node
+FROM node:20.5-alpine3.18 AS unteris-node
 
 RUN npm i -g pnpm@8.6.10 && \
-	apk add --no-cache \
-	dumb-init=1.2.5-r2
+  apk add --no-cache \
+  dumb-init=1.2.5-r2
 
 FROM unteris-node AS unteris-common
 
 WORKDIR /src
 RUN apk add --no-cache \
-	python3 \
-	make \
-	gcc \
-	g++
+  python3 \
+  make \
+  gcc \
+  g++
 COPY package.json \
-	tsconfig* \
-	nx.json \
-	pnpm-lock.yaml \
-	./
+  tsconfig* \
+  nx.json \
+  pnpm-lock.yaml \
+  ./
 ENV CYPRESS_INSTALL_BINARY=0
 RUN pnpm i
 
diff --git a/apps/image-server/Dockerfile b/apps/image-server/Dockerfile
index 782b07a..e1a4d58 100644
--- a/apps/image-server/Dockerfile
+++ b/apps/image-server/Dockerfile
@@ -1,23 +1,23 @@
-FROM node:20.2-alpine3.18 as unteris-node
+FROM node:20.5-alpine3.18 AS unteris-node
 
 
 RUN npm i -g pnpm@8.6.10 && \
-	apk add --no-cache \
-	dumb-init=1.2.5-r2
+  apk add --no-cache \
+  dumb-init=1.2.5-r2
 
 FROM unteris-node AS unteris-common
 
 WORKDIR /src
 RUN apk add --no-cache \
-	python3 \
-	make \
-	gcc \
-	g++
+  python3 \
+  make \
+  gcc \
+  g++
 COPY package.json \
-	tsconfig* \
-	nx.json \
-	pnpm-lock.yaml \
-	./
+  tsconfig* \
+  nx.json \
+  pnpm-lock.yaml \
+  ./
 ENV CYPRESS_INSTALL_BINARY=0
 RUN pnpm i
 
diff --git a/apps/server/Dockerfile b/apps/server/Dockerfile
index e5dba20..7215125 100644
--- a/apps/server/Dockerfile
+++ b/apps/server/Dockerfile
@@ -1,23 +1,23 @@
-FROM node:20.2-alpine3.18 as unteris-node
+FROM node:20.5-alpine3.18 AS unteris-node
 
 
 RUN npm i -g pnpm@8.6.10 && \
-	apk add --no-cache \
-	dumb-init=1.2.5-r2
+  apk add --no-cache \
+  dumb-init=1.2.5-r2
 
 FROM unteris-node AS unteris-common
 
 WORKDIR /src
 RUN apk add --no-cache \
-	python3 \
-	make \
-	gcc \
-	g++
+  python3 \
+  make \
+  gcc \
+  g++
 COPY package.json \
-	tsconfig* \
-	nx.json \
-	pnpm-lock.yaml \
-	./
+  tsconfig* \
+  nx.json \
+  pnpm-lock.yaml \
+  ./
 ENV CYPRESS_INSTALL_BINARY=0
 RUN pnpm i
 
diff --git a/apps/site/Dockerfile b/apps/site/Dockerfile
index d504c15..c38cd05 100644
--- a/apps/site/Dockerfile
+++ b/apps/site/Dockerfile
@@ -1,23 +1,23 @@
-FROM node:20.2-alpine3.18 as unteris-node
+FROM node:20.5-alpine3.18 AS unteris-node
 
 
 RUN npm i -g pnpm@8.6.10 && \
-	apk add --no-cache \
-	dumb-init=1.2.5-r2
+  apk add --no-cache \
+  dumb-init=1.2.5-r2
 
 FROM unteris-node AS unteris-common
 
 WORKDIR /src
 RUN apk add --no-cache \
-	python3 \
-	make \
-	gcc \
-	g++
+  python3 \
+  make \
+  gcc \
+  g++
 COPY package.json \
-	tsconfig* \
-	nx.json \
-	pnpm-lock.yaml \
-	./
+  tsconfig* \
+  nx.json \
+  pnpm-lock.yaml \
+  ./
 ENV CYPRESS_INSTALL_BINARY=0
 RUN pnpm i
 
@@ -29,7 +29,7 @@ COPY libs/ui ./libs/ui
 COPY libs/shared ./libs/shared/
 RUN VITE_SERVER_URL=$SERVER_URL pnpm nx run site:build:production
 
-FROM caddy:2.6.4-alpine as site-prod
+FROM caddy:2.6.4-alpine AS site-prod
 LABEL description="The Unteris website image, ran via a Caddy reverse proxy"
 WORKDIR /src
 COPY apps/site/robots.txt ./dist/apps/site/robots.txt