diff --git a/docker/klipper/Dockerfile b/docker/klipper/Dockerfile
index 146d8fa..12f0967 100644
--- a/docker/klipper/Dockerfile
+++ b/docker/klipper/Dockerfile
@@ -1,6 +1,6 @@
 ## Get Klipper Source and Build venv
 ##
-FROM python:3.11-bookworm as build
+FROM python:3.11-bookworm AS build
 
 RUN apt update \
  && apt install -y cmake \
@@ -29,7 +29,7 @@ RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \
 
 ## Klippy Runtime Image
 ##
-FROM python:3.11-slim-bookworm as run
+FROM python:3.11-slim-bookworm AS run
 
 WORKDIR /opt
 RUN groupadd klipper --gid 1000 \
@@ -51,7 +51,7 @@ CMD ["-I", "printer_data/run/klipper.tty", "-a", "printer_data/run/klipper.sock"
 
 ## Image for building MCU code including other tooling
 ##
-FROM debian:bookworm as tools
+FROM debian:bookworm AS tools
 
 WORKDIR /opt
 ARG DEBIAN_FRONTEND=noninteractive
@@ -73,7 +73,7 @@ COPY --from=build /opt/venv ./venv
 
 ## Build the klipper_mcu binary
 ##
-FROM tools as build-hostmcu
+FROM tools AS build-hostmcu
 
 WORKDIR /opt
 
@@ -85,7 +85,7 @@ RUN cd klipper \
 
 ## Runtime image for the klipper_mcu binary
 ##
-FROM debian:bookworm-slim as hostmcu
+FROM debian:bookworm-slim AS hostmcu
 
 RUN apt update \
  && apt install -y gpiod \
@@ -101,7 +101,7 @@ CMD ["-I", "/opt/printer_data/run/klipper_host_mcu.tty"]
 
 ## Build Simulavr and klipper.elf
 ## For manual builds, not uploaded to the docker registry
-FROM tools as build-simulavr
+FROM tools AS build-simulavr
 
 RUN apt update \
  && apt install -y \
diff --git a/docker/klipperscreen/Dockerfile b/docker/klipperscreen/Dockerfile
index 278b510..a865081 100644
--- a/docker/klipperscreen/Dockerfile
+++ b/docker/klipperscreen/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.13-bookworm as build
+FROM python:3.13-bookworm AS build
 
 ARG REPO=https://github.com/KlipperScreen/KlipperScreen
 ARG VERSION=master
@@ -19,7 +19,7 @@ RUN git clone ${REPO} klipperscreen \
 RUN python -m venv venv \
  && venv/bin/pip install -r klipperscreen/scripts/KlipperScreen-requirements.txt
 
-FROM python:3.13-slim-bookworm as run
+FROM python:3.13-slim-bookworm AS run
 
 RUN apt update \
  && apt install -y \
diff --git a/docker/moonraker/Dockerfile b/docker/moonraker/Dockerfile
index 03297ce..cb1ca68 100644
--- a/docker/moonraker/Dockerfile
+++ b/docker/moonraker/Dockerfile
@@ -1,5 +1,5 @@
 ## Get Code and Build venv
-FROM python:3.12-bookworm as build
+FROM python:3.12-bookworm AS build
 
 WORKDIR /opt
 COPY requirements-prind.txt .
@@ -20,7 +20,7 @@ RUN python -m venv venv \
  && venv/bin/pip install -r moonraker/scripts/moonraker-requirements.txt
 
 ## Runtime Image
-FROM python:3.12-slim-bookworm as run
+FROM python:3.12-slim-bookworm AS run
 
 RUN apt update \
  && apt install -y \
diff --git a/docker/ustreamer/Dockerfile b/docker/ustreamer/Dockerfile
index 1e64088..38c3fa6 100644
--- a/docker/ustreamer/Dockerfile
+++ b/docker/ustreamer/Dockerfile
@@ -1,5 +1,5 @@
 ## Get Code and make
-FROM debian:bookworm-slim as build
+FROM debian:bookworm-slim AS build
 
 ARG REPO=https://github.com/pikvm/ustreamer
 ARG VERSION=master
@@ -28,7 +28,7 @@ RUN cd ustreamer \
  && make LDFLAGS=-latomic
 
 ## Runtime Image
-FROM debian:bookworm-slim as run
+FROM debian:bookworm-slim AS run
 
 RUN apt update \
  && apt install -y \