diff --git a/cmd/config-manager/Dockerfile b/cmd/config-manager/Dockerfile
index 9b8bf4155..ce66f9c2e 100644
--- a/cmd/config-manager/Dockerfile
+++ b/cmd/config-manager/Dockerfile
@@ -1,7 +1,7 @@
 # Build Stage
 ARG GO_VERSION=1.22
 
-FROM golang:${GO_VERSION}-bullseye as build
+FROM golang:${GO_VERSION}-bullseye AS build
 WORKDIR /go/builder
 
 # Fetch go dependencies in a separate layer for caching
diff --git a/cmd/plugins/balloons/Dockerfile b/cmd/plugins/balloons/Dockerfile
index c0d93a6fa..443140c62 100644
--- a/cmd/plugins/balloons/Dockerfile
+++ b/cmd/plugins/balloons/Dockerfile
@@ -1,6 +1,6 @@
 ARG GO_VERSION=1.22
 
-FROM golang:${GO_VERSION}-bullseye as builder
+FROM golang:${GO_VERSION}-bullseye AS builder
 
 ARG IMAGE_VERSION
 ARG BUILD_VERSION
diff --git a/cmd/plugins/memory-qos/Dockerfile b/cmd/plugins/memory-qos/Dockerfile
index 1dd1161ee..9d3b039c4 100644
--- a/cmd/plugins/memory-qos/Dockerfile
+++ b/cmd/plugins/memory-qos/Dockerfile
@@ -1,6 +1,6 @@
 ARG GO_VERSION=1.22
 
-FROM golang:${GO_VERSION}-bullseye as builder
+FROM golang:${GO_VERSION}-bullseye AS builder
 
 ARG IMAGE_VERSION
 ARG BUILD_VERSION
diff --git a/cmd/plugins/memtierd/Dockerfile b/cmd/plugins/memtierd/Dockerfile
index 158d1927b..57f463ebe 100644
--- a/cmd/plugins/memtierd/Dockerfile
+++ b/cmd/plugins/memtierd/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye as builder
+FROM golang:1.22-bullseye AS builder
 
 ARG IMAGE_VERSION
 ARG BUILD_VERSION
diff --git a/cmd/plugins/sgx-epc/Dockerfile b/cmd/plugins/sgx-epc/Dockerfile
index 8f099fca1..7a907aa86 100644
--- a/cmd/plugins/sgx-epc/Dockerfile
+++ b/cmd/plugins/sgx-epc/Dockerfile
@@ -1,6 +1,6 @@
 ARG GO_VERSION=1.22
 
-FROM golang:${GO_VERSION}-bullseye as builder
+FROM golang:${GO_VERSION}-bullseye AS builder
 
 ARG IMAGE_VERSION
 ARG BUILD_VERSION
diff --git a/cmd/plugins/template/Dockerfile b/cmd/plugins/template/Dockerfile
index ab4e35649..a657c3171 100644
--- a/cmd/plugins/template/Dockerfile
+++ b/cmd/plugins/template/Dockerfile
@@ -1,6 +1,6 @@
 ARG GO_VERSION=1.22
 
-FROM golang:${GO_VERSION}-bullseye as builder
+FROM golang:${GO_VERSION}-bullseye AS builder
 
 ARG IMAGE_VERSION
 ARG BUILD_VERSION
diff --git a/cmd/plugins/topology-aware/Dockerfile b/cmd/plugins/topology-aware/Dockerfile
index 39083cbea..3c7e1c732 100644
--- a/cmd/plugins/topology-aware/Dockerfile
+++ b/cmd/plugins/topology-aware/Dockerfile
@@ -1,6 +1,6 @@
 ARG GO_VERSION=1.22
 
-FROM golang:${GO_VERSION}-bullseye as builder
+FROM golang:${GO_VERSION}-bullseye AS builder
 
 ARG IMAGE_VERSION
 ARG BUILD_VERSION
diff --git a/deployment/operator/Dockerfile b/deployment/operator/Dockerfile
index 7fe071731..2ccb9971c 100644
--- a/deployment/operator/Dockerfile
+++ b/deployment/operator/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:latest as build
+FROM fedora:latest AS build
 ENV VERIFY_CHECKSUM=false
 RUN curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 \
  && chmod 700 get_helm.sh && ./get_helm.sh
diff --git a/test/self-hosted-runner/docker/Dockerfile b/test/self-hosted-runner/docker/Dockerfile
index 066b955ee..20f109063 100644
--- a/test/self-hosted-runner/docker/Dockerfile
+++ b/test/self-hosted-runner/docker/Dockerfile
@@ -1,7 +1,7 @@
 ARG BASE_IMAGE
 ARG GH_APP_PRIVATE_KEY_FILE
 
-FROM ${BASE_IMAGE} as builder
+FROM ${BASE_IMAGE} AS builder
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC