diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 220230b..b604351 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -108,7 +108,7 @@ jobs:
           fi
 
       - name: DockerHub Build and Release (with latest)
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: env.publish_latest == 'true'
         with:
           platforms: linux/amd64,linux/arm64
@@ -119,7 +119,7 @@ jobs:
           context: .
 
       - name: DockerHub Build and Release (without latest)
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: env.publish_latest == 'false'
         with:
           platforms: linux/amd64,linux/arm64
diff --git a/dev/builder.local.Dockerfile b/dev/builder.local.Dockerfile
index ed61e4c..8b4f8c5 100644
--- a/dev/builder.local.Dockerfile
+++ b/dev/builder.local.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:11-slim as builder
+FROM debian:11-slim AS builder
 # A developer variant of protocurl for local development. See DEVELOPER.md
 # This should be kept in sync with release/builder.Dockerfile
 
diff --git a/release/builder.Dockerfile b/release/builder.Dockerfile
index 74f3aab..cda1cba 100644
--- a/release/builder.Dockerfile
+++ b/release/builder.Dockerfile
@@ -1,6 +1,6 @@
 # This should be kept in sync with dev/builder.local.Dockerfile
 
-FROM debian:11-slim as builder
+FROM debian:11-slim AS builder
 ARG VERSION
 ARG TARGETARCH
 RUN apt-get -q update && \
diff --git a/release/final.Dockerfile b/release/final.Dockerfile
index 66f2903..4a56734 100644
--- a/release/final.Dockerfile
+++ b/release/final.Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/distroless/cc:latest as final
+FROM gcr.io/distroless/cc:latest AS final
 
 WORKDIR /protocurl