diff --git a/Containers/apache/Dockerfile b/Containers/apache/Dockerfile
index c4070766..c9106443 100644
--- a/Containers/apache/Dockerfile
+++ b/Containers/apache/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM caddy:2.8.4-alpine as caddy
+FROM caddy:2.8.4-alpine AS caddy
 
 FROM httpd:2.4.59-alpine3.20
 
diff --git a/Containers/imaginary/Dockerfile b/Containers/imaginary/Dockerfile
index ef16c959..7c810683 100644
--- a/Containers/imaginary/Dockerfile
+++ b/Containers/imaginary/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM golang:1.22.3-alpine3.20 as go
+FROM golang:1.22.3-alpine3.20 AS go
 
 ENV IMAGINARY_HASH 6cd9edd1d3fb151eb773c14552886e4fc8e50138
 
diff --git a/Containers/mastercontainer/Dockerfile b/Containers/mastercontainer/Dockerfile
index 516c863a..1cf825ca 100644
--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:latest
 # Docker CLI is a requirement
-FROM docker:26.1.4-cli as docker
+FROM docker:26.1.4-cli AS docker
 
 # Caddy is a requirement
-FROM caddy:2.8.4-alpine as caddy
+FROM caddy:2.8.4-alpine AS caddy
 
 # From https://github.com/docker-library/php/blob/master/8.3/alpine3.20/fpm/Dockerfile
 FROM php:8.3.8-fpm-alpine3.20
diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile
index ef973845..9a7b3627 100644
--- a/Containers/talk/Dockerfile
+++ b/Containers/talk/Dockerfile
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:latest
-FROM nats:2.10.16-scratch as nats
+FROM nats:2.10.16-scratch AS nats
 FROM eturnal/eturnal:1.12.0 AS eturnal
-FROM strukturag/nextcloud-spreed-signaling:1.3.1 as signaling
-FROM alpine:3.20.1 as janus
+FROM strukturag/nextcloud-spreed-signaling:1.3.1 AS signaling
+FROM alpine:3.20.1 AS janus
 
 ARG JANUS_VERSION=v0.14.2
 WORKDIR /src
diff --git a/Containers/watchtower/Dockerfile b/Containers/watchtower/Dockerfile
index 7fcdc452..0d694282 100644
--- a/Containers/watchtower/Dockerfile
+++ b/Containers/watchtower/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # From https://github.com/containrrr/watchtower/blob/main/dockerfiles/Dockerfile.self-contained
-FROM containrrr/watchtower:1.7.1 as watchtower
+FROM containrrr/watchtower:1.7.1 AS watchtower
 
 FROM alpine:3.20.1